OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged in antmerlino/nuttx/mac802154_fixes (pull request #998) 

Mac802154 fixes

* mac802154: Frame Version should have been 1, but was being set to 3 when payload exceeds version 0 capabilities.

* mac802154: Corrects function reference in warning print-out

* mac802154/sixlowpan: Adds warning to build to indicate what is noted in the menu for CONFIG_MAC802154_NTXDESC

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2019-08-16 01:28:26 +00:00 committed by Gregory Nutt
parent fc1780d63e
commit 29ab94198c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wireless/ieee802154/mac802154.c
View File

@ -206,7 +206,7 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
ret = mac802154_lock(priv, allow_interrupt); ret = mac802154_lock(priv, allow_interrupt);
if (ret < 0) if (ret < 0)
{ {
wlwarn("WARNING: mac802154_takesem failed: %d\n", ret); wlwarn("WARNING: mac802154_lock failed: %d\n", ret);
mac802154_givesem(&priv->txdesc_sem); mac802154_givesem(&priv->txdesc_sem);
return -EINTR; return -EINTR;

2
wireless/ieee802154/mac802154_data.c
View File

@ -110,7 +110,7 @@ int mac802154_req_data(MACHANDLE mac,
if ((frame->io_len - frame->io_offset) > IEEE802154_MAX_SAFE_MAC_PAYLOAD_SIZE) if ((frame->io_len - frame->io_offset) > IEEE802154_MAX_SAFE_MAC_PAYLOAD_SIZE)
{ {
*frame_ctrl |= IEEE802154_FRAMECTRL_VERSION; *frame_ctrl |= (1 << IEEE802154_FRAMECTRL_SHIFT_VERSION);
} }
/* If the TXOptions parameter specifies that an acknowledged transmission /* If the TXOptions parameter specifies that an acknowledged transmission

4
wireless/ieee802154/mac802154_netdev.c
View File

@ -114,6 +114,10 @@
# define MACNET_FRAMELEN IEEE802154_MAX_PHY_PACKET_SIZE # define MACNET_FRAMELEN IEEE802154_MAX_PHY_PACKET_SIZE
#endif #endif
#if (CONFIG_MAC802154_NTXDESC < CONFIG_IOB_NBUFFERS)
# warning "CONFIG_MAC802154_NTXDES should probably be equal to CONFIG_IOB_NBUFFERS to avoid waiting on req_data"
#endif
/* TX poll delay = 1 seconds. CLK_TCK is the number of clock ticks per second */ /* TX poll delay = 1 seconds. CLK_TCK is the number of clock ticks per second */
#define TXPOLL_WDDELAY (1*CLK_TCK) #define TXPOLL_WDDELAY (1*CLK_TCK)