gnrc: fix link-layer/IPv6 address conversion for XBee

RIOT-OS · Jan 31, 2018 · c40a05b · c40a05b
1 parent 289e572
commit c40a05b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c
@@ -770,7 +770,7 @@ int gnrc_netif_ipv6_group_idx(gnrc_netif_t *netif, const ipv6_addr_t *addr)
 }
 
 #if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_CC110X) || \
-    defined(MODULE_NRFMIN)
+    defined(MODULE_NRFMIN) || defined(MODULE_XBEE)
 static void _create_iid_from_short(const gnrc_netif_t *netif, eui64_t *eui64)
 {
     const unsigned offset = sizeof(eui64_t) - netif->l2addr_len;
@@ -782,7 +782,7 @@ static void _create_iid_from_short(const gnrc_netif_t *netif, eui64_t *eui64)
     memcpy(&eui64->uint8[offset], netif->l2addr, netif->l2addr_len);
 }
 #endif /* defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_CC110X) ||
-        * defined(MODULE_NRFMIN) */
+        * defined(MODULE_NRFMIN) || defined(MODULE_XBEE) */
 
 int gnrc_netif_ipv6_get_iid(gnrc_netif_t *netif, eui64_t *eui64)
 {
@@ -802,7 +802,7 @@ int gnrc_netif_ipv6_get_iid(gnrc_netif_t *netif, eui64_t *eui64)
                 eui64->uint8[7] = netif->l2addr[5];
                 return 0;
 #endif
-#ifdef MODULE_NETDEV_IEEE802154
+#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE)
             case NETDEV_TYPE_IEEE802154:
                 switch (netif->l2addr_len) {
                     case IEEE802154_SHORT_ADDRESS_LEN:
@@ -1120,7 +1120,7 @@ static void _update_l2addr_from_dev(gnrc_netif_t *netif)
     netopt_t opt = NETOPT_ADDRESS;
 
     switch (netif->device_type) {
-#ifdef MODULE_NETDEV_IEEE802154
+#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE)
         case NETDEV_TYPE_IEEE802154: {
                 uint16_t tmp;
 
@@ -1157,7 +1157,7 @@ static void _init_from_device(gnrc_netif_t *netif)
     assert(res == sizeof(tmp));
     netif->device_type = (uint8_t)tmp;
     switch (netif->device_type) {
-#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_NRFMIN)
+#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_NRFMIN) || defined(MODULE_XBEE)
         case NETDEV_TYPE_IEEE802154:
         case NETDEV_TYPE_NRFMIN:
 #ifdef MODULE_GNRC_SIXLOWPAN_IPHC

diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-6ln.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-6ln.c
@@ -50,14 +50,14 @@ static inline uint8_t _reverse_iid(const ipv6_addr_t *dst,
             l2addr[5] = dst->u8[15];
             return ETHERNET_ADDR_LEN;
 #endif  /* MODULE_NETDEV_ETH */
-#ifdef MODULE_NETDEV_IEEE802154
+#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE)
         case NETDEV_TYPE_IEEE802154:
             /* assume address was based on EUI-64
              * (see https://tools.ietf.org/html/rfc6775#section-5.2) */
             memcpy(l2addr, &dst->u64[1], sizeof(dst->u64[1]));
             l2addr[0] ^= 0x02;
             return sizeof(dst->u64[1]);
-#endif  /* MODULE_NETDEV_IEEE802154 */
+#endif  /* defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE) */
 #ifdef MODULE_NRFMIN
         case NETDEV_TYPE_NRFMIN:
             l2addr[0] = dst->u8[14];

diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c
@@ -193,7 +193,7 @@ static inline unsigned _get_l2addr_len(gnrc_netif_t *netif,
             (void)opt;
             return sizeof(uint16_t);
 #endif  /* MODULE_NRFMIN */
-#ifdef MODULE_NETDEV_IEEE802154
+#if defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE)
         case NETDEV_TYPE_IEEE802154:
             switch (opt->len) {
                 case 1U:
@@ -203,7 +203,7 @@ static inline unsigned _get_l2addr_len(gnrc_netif_t *netif,
                 default:
                     return 0U;
             }
-#endif  /* MODULE_NETDEV_IEEE802154 */
+#endif  /* defined(MODULE_NETDEV_IEEE802154) || defined(MODULE_XBEE) */
         default:
             (void)opt;
             return 0U;