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

Merged in antmerlino/nuttx/avoid-double-context-lookup (pull request #788)

Browse Source 
sixlowpan: Address comment regarding avoiding double lookup of address context.

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2018-12-19 18:41:27 +00:00
committed by GregoryN
parent 4c601faf6f
commit 33a4ec969a
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154_data.c
+4 -4
View File
@@ -127,12 +127,12 @@ int mac802154_req_data(MACHANDLE mac,
if (meta->destaddr.mode != IEEE802154_ADDRMODE_NONE)
{
IEEE802154_PANIDCOPY(&frame->io_data[mhr_len], meta->destaddr.panid);
mhr_len += 2;
mhr_len += IEEE802154_PANIDSIZE;
if (meta->destaddr.mode == IEEE802154_ADDRMODE_SHORT)
{
IEEE802154_SADDRCOPY(&frame->io_data[mhr_len], meta->destaddr.saddr);
mhr_len += 2;
mhr_len += IEEE802154_SADDRSIZE;
}
else if (meta->destaddr.mode == IEEE802154_ADDRMODE_EXTENDED)
{
@@ -185,13 +185,13 @@ int mac802154_req_data(MACHANDLE mac,
(!(*frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP)))
{
IEEE802154_PANIDCOPY(&frame->io_data[mhr_len], priv->addr.panid);
mhr_len += 2;
mhr_len += IEEE802154_PANIDSIZE;
}
if (meta->srcmode == IEEE802154_ADDRMODE_SHORT)
{
IEEE802154_SADDRCOPY(&frame->io_data[mhr_len], priv->addr.saddr);
mhr_len += 2;
mhr_len += IEEE802154_SADDRSIZE;
}
else if (meta->srcmode == IEEE802154_ADDRMODE_EXTENDED)
{