Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mac802154_req_data() can return without releasing the exclsem

Browse Source
This commit is contained in:
Gregory Nutt
2017-06-20 11:23:31 -06:00
parent 6dafb4f532
commit a82ab4b729
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154.c
-2
View File
@@ -169,7 +169,6 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
*/
ret = sem_trywait(&priv->txdesc_sem);
if (ret == OK)
{
*txdesc = (FAR struct ieee802154_txdesc_s *)sq_remfirst(&priv->txdesc_queue);
@@ -228,7 +227,6 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
}
(*txdesc)->conf = &notif->u.dataconf;
return OK;
}
wireless/ieee802154/mac802154_data.c
+16 -9
View File
@@ -147,7 +147,10 @@ int mac802154_req_data(MACHANDLE mac,
ret = mac802154_takesem(&priv->exclsem, true);
if (ret < 0)
{
return ret;
/* Should only fail it interrupted by a signal */
wlwarn("WARNING: mac802154_takesem failed: %d", ret);
goto errout_with_sem;
}
/* If both destination and source addressing information is present, the MAC
@@ -201,7 +204,8 @@ int mac802154_req_data(MACHANDLE mac,
if (priv->devmode != IEEE802154_DEVMODE_PANCOORD)
{
return -EINVAL;
ret = -EINVAL;
goto errout_with_sem;
}
}
@@ -231,7 +235,8 @@ int mac802154_req_data(MACHANDLE mac,
ret = mac802154_txdesc_alloc(priv, &txdesc, true);
if (ret < 0)
{
return ret;
wlwarn("WARNING: mac802154_txdesc_alloc failed: %d", ret);
goto errout_with_sem;
}
txdesc->conf->handle = meta->msdu_handle;
@@ -259,11 +264,8 @@ int mac802154_req_data(MACHANDLE mac,
* don't have to try and kick-off any transmission here.
*/
/* We no longer need to have the MAC layer locked. */
mac802154_givesem(&priv->exclsem);
return -ENOTSUP;
ret = -ENOTSUP;
goto errout_with_sem;
}
else
{
@@ -300,7 +302,8 @@ int mac802154_req_data(MACHANDLE mac,
else
{
mac802154_givesem(&priv->exclsem);
return -EINVAL;
ret = -EINVAL;
goto errout_with_sem;
}
}
else
@@ -320,6 +323,10 @@ int mac802154_req_data(MACHANDLE mac,
}
return OK;
errout_with_sem:
mac802154_givesem(&priv->exclsem);
return ret;
}
/****************************************************************************