diff --git a/configs/clicker2-stm32/Kconfig b/configs/clicker2-stm32/Kconfig
index fb4b89d98aa..694b9f3582e 100644
--- a/configs/clicker2-stm32/Kconfig
+++ b/configs/clicker2-stm32/Kconfig
@@ -38,7 +38,7 @@ config CLICKER2_STM32_MB2_BEE
 config CLICKER2_STM32_MRF24J40LH_VERBOSE
 	bool "Verbose MRF24J40 lowerhalf"
 	default n
-	depends on DEBUG_WIRELESS_INFO
+	depends on IEEE802154_MRF24J40 && DEBUG_WIRELESS_INFO
 	---help---
 		Enable verbose syslog for MRF24J40 lowerhalf
 
diff --git a/include/nuttx/wireless/ieee802154/ieee802154_mac.h b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
index 24ed1388bd4..a3fc7bc618d 100644
--- a/include/nuttx/wireless/ieee802154/ieee802154_mac.h
+++ b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
@@ -423,26 +423,30 @@ enum ieee802154_attr_e
   IEEE802154_ATTR_MAC_SADDR,
   IEEE802154_ATTR_MAC_SUPERFRAME_ORDER,
   IEEE802154_ATTR_MAC_SYNC_SYMBOL_OFFSET,
-  IEEE802154_PIB_MAC_TIMESTAMP_SUPPORT,
-  IEEE802154_PIB_MAC_TRANSACTION_PERSIST_TIME,
-  IEEE802154_PIB_MAC_TX_CTRL_ACTIVE_DUR,
-  IEEE802154_PIB_MAC_TX_CTRL_PAUSE_DUR,
-  IEEE802154_PIB_MAC_TX_TOTAL_DUR,
+  IEEE802154_ATTR_MAC_TIMESTAMP_SUPPORT,
+  IEEE802154_ATTR_MAC_TRANSACTION_PERSIST_TIME,
+  IEEE802154_ATTR_MAC_TX_CTRL_ACTIVE_DUR,
+  IEEE802154_ATTR_MAC_TX_CTRL_PAUSE_DUR,
+  IEEE802154_ATTR_MAC_TX_TOTAL_DUR,
   IEEE802154_ATTR_MAC_DEVMODE, /* Non-standard */
 
   /* MAC Security Attributes */
 
-  IEEE802154_PIB_MAC_KEY_TABLE = 0x70,
-  IEEE802154_PIB_MAC_DEV_TABLE,
-  IEEE802154_PIB_MAC_SEC_LVL_TABLE,
-  IEEE802154_PIB_MAC_FRAME_COUNTER,
-  IEEE802154_PIB_MAC_AUTOREQ_SEC_LVL,
-  IEEE802154_PIB_MAC_AUTOREQ_KEY_ID_MODE,
-  IEEE802154_PIB_MAC_AUTOREQ_KEY_SOURCE,
-  IEEE802154_PIB_MAC_AUTOREQ_KEY_INDEX,
-  IEEE802154_PIB_MAC_DEFAULT_KEY_SRC,
-  IEEE802154_PIB_MAC_PANCOORD_EXT_ADDR,
-  IEEE802154_PIB_MAC_PANCOORD_SHORT_ADDR,
+  IEEE802154_ATTR_MAC_KEY_TABLE = 0x70,
+  IEEE802154_ATTR_MAC_DEV_TABLE,
+  IEEE802154_ATTR_MAC_SEC_LVL_TABLE,
+  IEEE802154_ATTR_MAC_FRAME_COUNTER,
+  IEEE802154_ATTR_MAC_AUTOREQ_SEC_LVL,
+  IEEE802154_ATTR_MAC_AUTOREQ_KEY_ID_MODE,
+  IEEE802154_ATTR_MAC_AUTOREQ_KEY_SOURCE,
+  IEEE802154_ATTR_MAC_AUTOREQ_KEY_INDEX,
+  IEEE802154_ATTR_MAC_DEFAULT_KEY_SRC,
+  IEEE802154_ATTR_MAC_PANCOORD_EXT_ADDR,
+  IEEE802154_ATTR_MAC_PANCOORD_SHORT_ADDR,
+
+  /* Special Attributes */
+
+  IEEE802154_ATTR_RADIO_REGDUMP = 0xF0,
 };
 
 /* Frame Type */
@@ -564,11 +568,10 @@ struct ieee802154_capability_info_s
 
 struct ieee802154_superframespec_s
 {
-  uint16_t beaconorder   : 4;  /* Transmission interval of beacon */
-  uint16_t sforder       : 4;  /* Length of active portion of superframe */
+  uint16_t beaconorder    : 4;  /* Transmission interval of beacon */
+  uint16_t sforder        : 4;  /* Length of active portion of superframe */
   uint16_t final_capslot  : 4;  /* Last slot utilized by CAP */
   uint16_t ble            : 1;  /* Battery Life Extension (BLE) */
-  uint16_t reserved       : 1;  /* Reserved bit */
   uint16_t pancoord       : 1;  /* 1 if beacon sent by pan coordinator */
   uint16_t assocpermit    : 1;  /* 1 if coordinator is accepting associaton */
 };
diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c
index 6c93de3f15c..7bc0d6c4c97 100644
--- a/wireless/ieee802154/mac802154.c
+++ b/wireless/ieee802154/mac802154.c
@@ -229,9 +229,8 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
       return -EINTR;
     }
 
-  /* Set the purge time to zero */
-
   (*txdesc)->purgetime = 0;
+  (*txdesc)->retrycount = priv->maxretries;
 
   (*txdesc)->conf = &notif->u.dataconf;
   return OK;