riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3516 from authmillenon/ng_sixlowpan/fix/fix-the-dereviewed-fixes

Browse Source 
ng_sixlowpan: fix the kaputt-reviewed fixes
This commit is contained in:
Martine Lenders 2015-07-29 02:04:00 +02:00
commit 386d9f30cc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
View File

@ -218,7 +218,7 @@ static void _send(ng_pktsnip_t *pkt)
ng_pktbuf_release(pkt2); ng_pktbuf_release(pkt2);
return; return;
} }
dispatch_len += 1; dispatch_len++;
} }
#else #else
/* suppress clang-analyzer report about iface being not read */ /* suppress clang-analyzer report about iface being not read */
@ -229,7 +229,7 @@ static void _send(ng_pktsnip_t *pkt)
ng_pktbuf_release(pkt2); ng_pktbuf_release(pkt2);
return; return;
} }
dispatch_len += 1; dispatch_len++;
#endif #endif
datagram_size = ng_pkt_len(pkt2->next); datagram_size = ng_pkt_len(pkt2->next);
@ -238,7 +238,7 @@ static void _send(ng_pktsnip_t *pkt)
/* IP should not send anything here if it is not a 6LoWPAN interface, /* IP should not send anything here if it is not a 6LoWPAN interface,
* so we don't need to check for NULL pointers */ * so we don't need to check for NULL pointers */
if ((datagram_size + dispatch_len) <= iface->max_frag_size) { if (datagram_size <= iface->max_frag_size) {
DEBUG("6lo: Send SND command for %p to %" PRIu16 "\n", DEBUG("6lo: Send SND command for %p to %" PRIu16 "\n",
(void *)pkt2, hdr->if_pid); (void *)pkt2, hdr->if_pid);
ng_netapi_send(hdr->if_pid, pkt2); ng_netapi_send(hdr->if_pid, pkt2);
@ -248,14 +248,14 @@ static void _send(ng_pktsnip_t *pkt)
#ifdef MODULE_NG_SIXLOWPAN_FRAG #ifdef MODULE_NG_SIXLOWPAN_FRAG
else { else {
DEBUG("6lo: Send fragmented (%u > %" PRIu16 ")\n", DEBUG("6lo: Send fragmented (%u > %" PRIu16 ")\n",
(unsigned int)datagram_size + dispatch_len, iface->max_frag_size); (unsigned int)datagram_size, iface->max_frag_size);
ng_sixlowpan_frag_send(hdr->if_pid, pkt2, datagram_size + dispatch_len, ng_sixlowpan_frag_send(hdr->if_pid, pkt2, datagram_size,
datagram_size); datagram_size - dispatch_len);
} }
#else #else
(void)datagram_size; (void)datagram_size;
DEBUG("6lo: packet too big (%u> %" PRIu16 ")\n", DEBUG("6lo: packet too big (%u> %" PRIu16 ")\n",
(unsigned int)(datagram_size + dispatch_len), iface->max_frag_size); (unsigned int)datagram_size, iface->max_frag_size);
#endif #endif
} }