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

Remove conditionals around RPL extension header #defines and typedefs. With the conditional, it wasn't possible to compile the rpl-ext-header.c file. Since #defines and typedefs and 'free' at runtime, we gain nothing by having them conditional.

Browse source
This commit is contained in:
Adam Dunkels 2012-11-21 19:48:13 +01:00
parent 3a669d0caa
commit d51d3f6b3e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/uip.h
View file

@ -1769,7 +1769,6 @@ typedef struct uip_ext_hdr_opt_padn {
uint8_t opt_len; uint8_t opt_len;
} uip_ext_hdr_opt_padn; } uip_ext_hdr_opt_padn;
#if UIP_CONF_IPV6_RPL
/* RPL option */ /* RPL option */
typedef struct uip_ext_hdr_opt_rpl { typedef struct uip_ext_hdr_opt_rpl {
uint8_t opt_type; uint8_t opt_type;
@ -1778,7 +1777,6 @@ typedef struct uip_ext_hdr_opt_rpl {
uint8_t instance; uint8_t instance;
uint16_t senderrank; uint16_t senderrank;
} uip_ext_hdr_opt_rpl; } uip_ext_hdr_opt_rpl;
#endif /* UIP_CONF_IPV6_RPL */
/* TCP header */ /* TCP header */
struct uip_tcp_hdr { struct uip_tcp_hdr {
@ -1850,9 +1848,7 @@ struct uip_udp_hdr {
/** \brief Destination and Hop By Hop extension headers option types */ /** \brief Destination and Hop By Hop extension headers option types */
#define UIP_EXT_HDR_OPT_PAD1 0 #define UIP_EXT_HDR_OPT_PAD1 0
#define UIP_EXT_HDR_OPT_PADN 1 #define UIP_EXT_HDR_OPT_PADN 1
#if UIP_CONF_IPV6_RPL
#define UIP_EXT_HDR_OPT_RPL 0x63 #define UIP_EXT_HDR_OPT_RPL 0x63
#endif /* UIP_CONF_IPV6_RPL */
/** @} */ /** @} */