From 68535696337aadfab17f698075ea8721ad8d1ca8 Mon Sep 17 00:00:00 2001 From: Anthony Merlino Date: Fri, 3 Nov 2017 16:08:17 +0000 Subject: [PATCH] Merged in antmerlino/nuttx/mac802154 (pull request #527) mac802154: Fixes a warning for unused variable and returns -1 from macnet_notify() if event is not used. Approved-by: Gregory Nutt --- configs/clicker2-stm32/src/stm32_mrf24j40.c | 2 ++ wireless/ieee802154/mac802154_netdev.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/clicker2-stm32/src/stm32_mrf24j40.c b/configs/clicker2-stm32/src/stm32_mrf24j40.c index e3732fefd98..f8464382a40 100644 --- a/configs/clicker2-stm32/src/stm32_mrf24j40.c +++ b/configs/clicker2-stm32/src/stm32_mrf24j40.c @@ -228,7 +228,9 @@ static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) FAR struct ieee802154_radio_s *radio; MACHANDLE mac; FAR struct spi_dev_s *spi; +#ifdef CONFIG_IEEE802154_NETDEV int ret; +#endif /* Configure the interrupt pin */ diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c index 33ad3a5257a..953c37f26da 100644 --- a/wireless/ieee802154/mac802154_netdev.c +++ b/wireless/ieee802154/mac802154_netdev.c @@ -445,9 +445,14 @@ static int macnet_notify(FAR struct mac802154_maccb_s *maccb, #endif nxsem_post(&priv->md_exclsem); + return OK; } - return OK; + /* By returning a negative value, we let the MAC know that we don't want the + * primitive and it will free it for us + */ + + return -1; } /****************************************************************************