diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c index cac1cde930d7..2888cac364c3 100644 --- a/subsys/net/ip/tcp.c +++ b/subsys/net/ip/tcp.c @@ -193,10 +193,12 @@ static void tcp_retry_expired(struct k_timer *timer) net_pkt_set_queued(pkt, true); if (net_tcp_send_pkt(pkt) < 0 && !is_6lo_technology(pkt)) { - NET_DBG("[%p] pkt %p send failed", tcp, pkt); + NET_DBG("retry %u: [%p] pkt %p send failed", + tcp->retry_timeout_shift, tcp, pkt); net_pkt_unref(pkt); } else { - NET_DBG("[%p] sent pkt %p", tcp, pkt); + NET_DBG("retry %u: [%p] sent pkt %p", + tcp->retry_timeout_shift, tcp, pkt); if (IS_ENABLED(CONFIG_NET_STATISTICS_TCP) && !is_6lo_technology(pkt)) { net_stats_update_tcp_seg_rexmit(); diff --git a/subsys/usb/class/netusb/function_ecm.c b/subsys/usb/class/netusb/function_ecm.c index 6daf2b36e60c..891bffc656d8 100644 --- a/subsys/usb/class/netusb/function_ecm.c +++ b/subsys/usb/class/netusb/function_ecm.c @@ -233,41 +233,34 @@ int ecm_send(struct net_pkt *pkt) { u8_t send_buf[CONFIG_CDC_ECM_BULK_EP_MPS]; int remaining = sizeof(send_buf); + struct net_buf *frag; net_hexdump_frags("<", pkt); if (!pkt->frags) { - remaining = append_bytes(send_buf, sizeof(send_buf), - net_pkt_ll(pkt), - net_pkt_ll_reserve(pkt), - remaining); - if (remaining < 0) { - return remaining; - } - } else { - struct net_buf *frag; + return -ENODATA; + } + + remaining = append_bytes(send_buf, sizeof(send_buf), + net_pkt_ll(pkt), + net_pkt_ll_reserve(pkt) + + pkt->frags->len, + remaining); + if (remaining < 0) { + return remaining; + } + for (frag = pkt->frags->frags; frag; frag = frag->frags) { +#if VERBOSE_DEBUG + SYS_LOG_DBG("Fragment %p len %u, remaining %u", + frag, frag->len, remaining); +#endif remaining = append_bytes(send_buf, sizeof(send_buf), - net_pkt_ll(pkt), - net_pkt_ll_reserve(pkt) + - pkt->frags->len, + frag->data, frag->len, remaining); if (remaining < 0) { return remaining; } - - for (frag = pkt->frags->frags; frag; frag = frag->frags) { -#if VERBOSE_DEBUG - SYS_LOG_DBG("Fragment %p len %u, remaining %u", - frag, frag->len, remaining); -#endif - remaining = append_bytes(send_buf, sizeof(send_buf), - frag->data, frag->len, - remaining); - if (remaining < 0) { - return remaining; - } - } } if (remaining > 0 && remaining < sizeof(send_buf)) {