From 3e8d6388f8706ce15fc8d81ea440fb1555da96b6 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 21 Aug 2020 22:20:42 +0200 Subject: [PATCH] netdev_ieee802154: use eui_provider in netdev_ieee802154_setup() --- drivers/include/net/netdev/ieee802154.h | 8 +++++--- drivers/netdev_ieee802154/Makefile.dep | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 drivers/netdev_ieee802154/Makefile.dep diff --git a/drivers/include/net/netdev/ieee802154.h b/drivers/include/net/netdev/ieee802154.h index af87fda668..131fa981a0 100644 --- a/drivers/include/net/netdev/ieee802154.h +++ b/drivers/include/net/netdev/ieee802154.h @@ -20,11 +20,11 @@ #ifndef NET_NETDEV_IEEE802154_H #define NET_NETDEV_IEEE802154_H +#include "net/eui_provider.h" #include "net/ieee802154.h" #include "net/gnrc/nettype.h" #include "net/netopt.h" #include "net/netdev.h" -#include "luid.h" #ifdef __cplusplus extern "C" { @@ -208,8 +208,10 @@ int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr); */ static inline void netdev_ieee802154_setup(netdev_ieee802154_t *dev) { - luid_netdev_get_eui64(&dev->netdev, (eui64_t *)&dev->long_addr); - luid_get_short((network_uint16_t *)&dev->short_addr); + /* generate EUI-64 and short address */ + netdev_eui64_get(&dev->netdev, (eui64_t *)&dev->long_addr); + eui_short_from_eui64((eui64_t *)&dev->long_addr, + (network_uint16_t *)&dev->short_addr); } #ifdef __cplusplus diff --git a/drivers/netdev_ieee802154/Makefile.dep b/drivers/netdev_ieee802154/Makefile.dep new file mode 100644 index 0000000000..caed476090 --- /dev/null +++ b/drivers/netdev_ieee802154/Makefile.dep @@ -0,0 +1 @@ +USEMODULE += eui_provider