deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1365 from simonduq/pr/warning-free-no-frag

Browse source 
sicslowpan.c: warning-free compilation even with fragmentation disabled
This commit is contained in:
Nicolas Tsiftes 2015-11-11 13:24:14 +01:00
parent 729c4f9cf1 586f4a4ae3
commit a161dc2959
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/ipv6/sicslowpan.c
View file

@ -1363,8 +1363,10 @@ output(const uip_lladdr_t *localdest)
/* The MAC address of the destination of the packet */ /* The MAC address of the destination of the packet */
linkaddr_t dest; linkaddr_t dest;
#if SICSLOWPAN_CONF_FRAG
/* Number of bytes processed. */ /* Number of bytes processed. */
uint16_t processed_ip_out_len; uint16_t processed_ip_out_len;
#endif /* SICSLOWPAN_CONF_FRAG */
/* init */ /* init */
uncomp_hdr_len = 0; uncomp_hdr_len = 0;
@ -1593,8 +1595,8 @@ input(void)
uint16_t frag_size = 0; uint16_t frag_size = 0;
/* offset of the fragment in the IP packet */ /* offset of the fragment in the IP packet */
uint8_t frag_offset = 0; uint8_t frag_offset = 0;
uint8_t is_fragment = 0;
#if SICSLOWPAN_CONF_FRAG #if SICSLOWPAN_CONF_FRAG
uint8_t is_fragment = 0;
/* tag of the fragment */ /* tag of the fragment */
uint16_t frag_tag = 0; uint16_t frag_tag = 0;
uint8_t first_fragment = 0, last_fragment = 0; uint8_t first_fragment = 0, last_fragment = 0;