espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-07 03:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mac] process frame pending bit at the MAC layer (#2656)

Browse Source 
This commit allows processing of the frame pending bit to occur even if the
received frame is a duplicate.
This commit is contained in:
Jonathan Hui
2018-04-11 08:53:32 -07:00
committed by GitHub
parent 648e8b292a
commit 13b0de60e5
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/mac.cpp
+12 -9
View File
@@ -1668,12 +1668,13 @@ exit:
void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
{
Address srcaddr;
Address dstaddr;
PanId panid;
Neighbor *neighbor;
bool receive = false;
otError error = aError;
ThreadNetif &netif = GetNetif();
Address srcaddr;
Address dstaddr;
PanId panid;
Neighbor * neighbor;
bool receive = false;
otError error = aError;
#if OPENTHREAD_ENABLE_MAC_FILTER
int8_t rssi = OT_MAC_FILTER_FIXED_RSS_DISABLED;
#endif // OPENTHREAD_ENABLE_MAC_FILTER
@@ -1697,7 +1698,7 @@ void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
aFrame->GetSrcAddr(srcaddr);
aFrame->GetDstAddr(dstaddr);
neighbor = GetNetif().GetMle().GetNeighbor(srcaddr);
neighbor = netif.GetMle().GetNeighbor(srcaddr);
// Destination Address Filtering
switch (dstaddr.GetType())
@@ -1712,9 +1713,9 @@ void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
error = OT_ERROR_DESTINATION_ADDRESS_FILTERED);
// Allow multicasts from neighbor routers if FFD
if (neighbor == NULL && dstaddr.IsBroadcast() && (GetNetif().GetMle().GetDeviceMode() & Mle::ModeTlv::kModeFFD))
if (neighbor == NULL && dstaddr.IsBroadcast() && (netif.GetMle().GetDeviceMode() & Mle::ModeTlv::kModeFFD))
{
neighbor = GetNetif().GetMle().GetRxOnlyNeighborRouter(srcaddr);
neighbor = netif.GetMle().GetRxOnlyNeighborRouter(srcaddr);
}
break;
@@ -1811,6 +1812,8 @@ void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
ExitNow();
}
netif.GetMeshForwarder().GetDataPollManager().CheckFramePending(*aFrame);
if (neighbor != NULL)
{
#if OPENTHREAD_ENABLE_MAC_FILTER
src/core/thread/mesh_forwarder.cpp
-2
View File
@@ -1106,8 +1106,6 @@ void MeshForwarder::HandleReceivedFrame(Mac::Frame &aFrame)
netif.GetSupervisionListener().UpdateOnReceive(macSource, linkInfo.mLinkSecurity);
mDataPollManager.CheckFramePending(aFrame);
switch (aFrame.GetType())
{
case Mac::Frame::kFcfFrameData: