From 6547b2185bd6f0d663c8a7ce6c0538d316fd67e7 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Thu, 29 Nov 2018 15:31:55 +0100 Subject: [PATCH] gnrc_netif: remove ESP-Now related code-duplication --- sys/net/gnrc/netif/gnrc_netif.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c index 2c31ef15f4..58d505b04d 100644 --- a/sys/net/gnrc/netif/gnrc_netif.c +++ b/sys/net/gnrc/netif/gnrc_netif.c @@ -835,8 +835,9 @@ int gnrc_netif_ipv6_get_iid(gnrc_netif_t *netif, eui64_t *eui64) } switch (netif->device_type) { -#ifdef MODULE_NETDEV_ETH +#if defined(MODULE_NETDEV_ETH) || defined(MODULE_ESP_NOW) case NETDEV_TYPE_ETHERNET: + case NETDEV_TYPE_ESP_NOW: assert(netif->l2addr_len == ETHERNET_ADDR_LEN); eui64->uint8[0] = netif->l2addr[0] ^ 0x02; eui64->uint8[1] = netif->l2addr[1]; @@ -877,18 +878,6 @@ int gnrc_netif_ipv6_get_iid(gnrc_netif_t *netif, eui64_t *eui64) case NETDEV_TYPE_NRFMIN: _create_iid_from_short(netif, eui64); return 0; -#endif -#if defined(MODULE_ESP_NOW) - case NETDEV_TYPE_ESP_NOW: - eui64->uint8[0] = netif->l2addr[0] ^ 0x02; - eui64->uint8[1] = netif->l2addr[1]; - eui64->uint8[2] = netif->l2addr[2]; - eui64->uint8[3] = 0xff; - eui64->uint8[4] = 0xfe; - eui64->uint8[5] = netif->l2addr[3]; - eui64->uint8[6] = netif->l2addr[4]; - eui64->uint8[7] = netif->l2addr[5]; - return 0; #endif default: (void)eui64;