gnrc_mac: move l2_add to gnrc_netdev2.

RIOT-OS · Oct 28, 2016 · 36e7a0c · 36e7a0c
1 parent 450a1c8
commit 36e7a0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 48 deletions.
diff --git a/sys/include/net/gnrc/gnrc_mac/gnrc_mac.h b/sys/include/net/gnrc/gnrc_mac/gnrc_mac.h
diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
@@ -31,19 +31,11 @@
 #include <net/gnrc/netdev2.h>
 #include <net/gnrc/netif/hdr.h>
 #include <net/gnrc.h>
-#include <gnrc_mac.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/******************************************************************************/
-typedef struct {
-    uint8_t  addr[GNRC_NETIF_HDR_L2ADDR_MAX_LEN];
-    uint8_t  len;
-} l2_addr_t;
-#define GNRC_MAC_L2_ADDR_INIT      { {0}, 0 }
-
 /******************************************************************************/
 typedef enum {
     TX_FEEDBACK_UNDEF = 0,

diff --git a/sys/include/net/gnrc/netdev2.h b/sys/include/net/gnrc/netdev2.h
@@ -98,7 +98,20 @@ typedef struct gnrc_netdev2 {
     kernel_pid_t pid;
 
 #ifdef MODULE_GNRC_MAC
-    uint16_t mac_info;  /**< general information for the MAC protocol */
+    /**
+     * @brief general information for the MAC protocol
+     */
+    uint16_t mac_info;
+
+    /**
+     * @brief device's l2 address
+     */
+    uint8_t  l2_addr[GNRC_NETIF_HDR_L2ADDR_MAX_LEN];
+
+    /**
+     * @brief device's l2 address length
+     */
+    uint8_t  l2_addr_len;
 #endif
 } gnrc_netdev2_t;