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

6lowpan: eliminate unused compiler warning

Browse Source 
Fixes the bug that was introduced in b1ae07ca82a8ffd1647636c4860cd3895c06b0f6 where the wrong datagram size was used.
This commit is contained in:
Oleg Hahm 2015-09-26 11:44:31 +02:00
parent 49ef26dd7c
commit 57888f99a7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
View File

@ -256,8 +256,10 @@ static void _send(gnrc_pktsnip_t *pkt)
PRIkernel_pid "\n", iface->max_frag_size, hdr->if_pid); PRIkernel_pid "\n", iface->max_frag_size, hdr->if_pid);
/* 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 <= iface->max_frag_size) { * Note, that datagram_size cannot be used here, because the header size
* might be changed by IPHC. */
if (gnrc_pkt_len(pkt2->next) <= 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);
gnrc_netapi_send(hdr->if_pid, pkt2); gnrc_netapi_send(hdr->if_pid, pkt2);
@ -276,6 +278,7 @@ static void _send(gnrc_pktsnip_t *pkt)
gnrc_pktbuf_release(pkt2); gnrc_pktbuf_release(pkt2);
} }
#else #else
(void) datagram_size;
DEBUG("6lo: packet too big (%u > %" PRIu16 ")\n", DEBUG("6lo: packet too big (%u > %" PRIu16 ")\n",
(unsigned int)datagram_size, iface->max_frag_size); (unsigned int)datagram_size, iface->max_frag_size);
gnrc_pktbuf_release(pkt2); gnrc_pktbuf_release(pkt2);