Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drivers/wireless/ieee802154/mrf24j40/mrf24j40.c: Correct erroneous isolation of address mode field and subsequent bad comparison.

Browse Source
This commit is contained in:
Gregory Nutt
2019-10-02 12:50:43 -06:00
parent 388131f583
commit 0dbb22f61c
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/wireless/ieee802154/mrf24j40/mrf24j40.c
+12 -9
View File
@@ -370,22 +370,24 @@ void mrf24j40_setup_fifo(FAR struct mrf24j40_radio_s *dev,
uint32_t fifo_addr) uint32_t fifo_addr)
{ {
uint16_t frame_ctrl;
uint16_t addrmode;
int hlen = 3; /* Include frame control and seq number */ int hlen = 3; /* Include frame control and seq number */
int i; int i;
uint16_t frame_ctrl;
/* Analyze frame control to compute header length */ /* Analyze frame control to compute header length */
frame_ctrl = buf[0]; frame_ctrl = buf[0];
frame_ctrl |= (buf[1] << 8); frame_ctrl |= (buf[1] << 8);
if ((frame_ctrl & IEEE802154_FRAMECTRL_DADDR) == addrmode = (frame_ctrl & IEEE802154_FRAMECTRL_DADDR) >>
IEEE802154_ADDRMODE_SHORT) IEEE802154_FRAMECTRL_SHIFT_DADDR;
if (addrmode == IEEE802154_ADDRMODE_SHORT)
{ {
hlen += 2 + 2; /* Destination PAN + shortaddr */ hlen += 2 + 2; /* Destination PAN + shortaddr */
} }
else if ((frame_ctrl & IEEE802154_FRAMECTRL_DADDR) == else if (addrmode == IEEE802154_ADDRMODE_EXTENDED)
IEEE802154_ADDRMODE_EXTENDED)
{ {
hlen += 2 + 8; /* Destination PAN + extaddr */ hlen += 2 + 8; /* Destination PAN + extaddr */
} }
@@ -395,13 +397,14 @@ void mrf24j40_setup_fifo(FAR struct mrf24j40_radio_s *dev,
hlen += 2; /* No PAN compression, source PAN is different from dest PAN */ hlen += 2; /* No PAN compression, source PAN is different from dest PAN */
} }
if ((frame_ctrl & IEEE802154_FRAMECTRL_SADDR) == addrmode = (frame_ctrl & IEEE802154_FRAMECTRL_SADDR) >>
IEEE802154_ADDRMODE_SHORT) IEEE802154_FRAMECTRL_SHIFT_SADDR;
if (addrmode == IEEE802154_ADDRMODE_SHORT)
{ {
hlen += 2; /* Source saddr */ hlen += 2; /* Source saddr */
} }
else if ((frame_ctrl & IEEE802154_FRAMECTRL_SADDR) == else if ((addrmode == IEEE802154_ADDRMODE_EXTENDED)
IEEE802154_ADDRMODE_EXTENDED)
{ {
hlen += 8; /* Ext saddr */ hlen += 8; /* Ext saddr */
} }