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

Merged in antmerlino/nuttx/mac_txdesc_ackreq_fix (pull request #986)

Browse Source 
mac802154: Fixes issue where the txdesc's ackreq flag was not being set, despite the frame containing a Frame Control field with ACKREQ bit set.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2019-08-10 18:27:49 +00:00
committed by Gregory Nutt
parent a8e1620f3c
commit 6f4c9678af
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154.c
+2
View File
@@ -342,6 +342,7 @@ void mac802154_createdatareq(FAR struct ieee802154_privmac_s *priv,
txdesc->frame = iob; txdesc->frame = iob;
txdesc->frametype = IEEE802154_FRAME_COMMAND; txdesc->frametype = IEEE802154_FRAME_COMMAND;
txdesc->ackreq = true;
/* Save a copy of the destination addressing information into the tx /* Save a copy of the destination addressing information into the tx
* descriptor. We only do this for commands to help with handling their * descriptor. We only do this for commands to help with handling their
@@ -1632,6 +1633,7 @@ static void mac802154_rxdatareq(FAR struct ieee802154_privmac_s *priv,
txdesc->frame = iob; txdesc->frame = iob;
txdesc->frametype = IEEE802154_FRAME_DATA; txdesc->frametype = IEEE802154_FRAME_DATA;
txdesc->ackreq = false;
mac802154_unlock(priv) mac802154_unlock(priv)
wireless/ieee802154/mac802154_assoc.c
+2
View File
@@ -234,6 +234,7 @@ int mac802154_req_associate(MACHANDLE mac,
txdesc->frame = iob; txdesc->frame = iob;
txdesc->frametype = IEEE802154_FRAME_COMMAND; txdesc->frametype = IEEE802154_FRAME_COMMAND;
txdesc->ackreq = true;
/* Save a copy of the destination addressing infromation into the tx /* Save a copy of the destination addressing infromation into the tx
* descriptor. We only do this for commands to help with handling their * descriptor. We only do this for commands to help with handling their
@@ -422,6 +423,7 @@ int mac802154_resp_associate(MACHANDLE mac,
txdesc->frame = iob; txdesc->frame = iob;
txdesc->frametype = IEEE802154_FRAME_COMMAND; txdesc->frametype = IEEE802154_FRAME_COMMAND;
txdesc->ackreq = true;
txdesc->destaddr.mode = IEEE802154_ADDRMODE_EXTENDED; txdesc->destaddr.mode = IEEE802154_ADDRMODE_EXTENDED;
IEEE802154_PANIDCOPY(txdesc->destaddr.panid, priv->addr.panid); IEEE802154_PANIDCOPY(txdesc->destaddr.panid, priv->addr.panid);