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

Merge pull request #2028 from joakimeriksson/minimal-net-ND-fix

Browse source 
added support for 6-bytes link-layer address
This commit is contained in:
Antonio Lignan 2017-01-10 09:07:50 +01:00 committed by GitHub
parent 247d79ea7c cbf4a843e2
commit 82f3ce392e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/net/linkaddr.c
View file

@ -52,6 +52,9 @@ const linkaddr_t linkaddr_null = { { 0, 0 } };
#if LINKADDR_SIZE == 8 #if LINKADDR_SIZE == 8
const linkaddr_t linkaddr_null = { { 0, 0, 0, 0, 0, 0, 0, 0 } }; const linkaddr_t linkaddr_null = { { 0, 0, 0, 0, 0, 0, 0, 0 } };
#endif /*LINKADDR_SIZE == 8*/ #endif /*LINKADDR_SIZE == 8*/
#if LINKADDR_SIZE == 6
const linkaddr_t linkaddr_null = { { 0, 0, 0, 0, 0, 0 } };
#endif /*LINKADDR_SIZE == 6*/
#endif /*LINKADDR_SIZE == 2*/ #endif /*LINKADDR_SIZE == 2*/

2
platform/minimal-net/contiki-conf.h
View file

@ -64,7 +64,6 @@ typedef int32_t s32_t;
typedef unsigned short uip_stats_t; typedef unsigned short uip_stats_t;
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
/* The Windows build uses wpcap to connect to a host interface. It finds the interface by scanning for /* The Windows build uses wpcap to connect to a host interface. It finds the interface by scanning for
* an address, which can be specified here and overridden with the command line. * an address, which can be specified here and overridden with the command line.
@ -148,6 +147,7 @@ typedef unsigned short uip_stats_t;
#endif #endif
#define UIP_CONF_LLH_LEN 14 #define UIP_CONF_LLH_LEN 14
#define LINKADDR_CONF_SIZE 6
#define UIP_CONF_MAX_LISTENPORTS 40 #define UIP_CONF_MAX_LISTENPORTS 40
#define UIP_CONF_MAX_CONNECTIONS 40 #define UIP_CONF_MAX_CONNECTIONS 40
#define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN #define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN