[mac] simplify how HandleReceivedFrame() passes frame to next layer (#3941)

This commit is contained in:
Abtin Keshavarzian
2019-06-25 00:23:03 -07:00
committed by Jonathan Hui
parent adecc05755
commit ce8f1172a8
+4 -11
View File
@@ -1480,8 +1480,7 @@ void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
Address dstaddr; Address dstaddr;
PanId panid; PanId panid;
Neighbor *neighbor; Neighbor *neighbor;
bool receive = false; otError error = aError;
otError error = aError;
#if OPENTHREAD_ENABLE_MAC_FILTER #if OPENTHREAD_ENABLE_MAC_FILTER
int8_t rssi = OT_MAC_FILTER_FIXED_RSS_DISABLED; int8_t rssi = OT_MAC_FILTER_FIXED_RSS_DISABLED;
#endif // OPENTHREAD_ENABLE_MAC_FILTER #endif // OPENTHREAD_ENABLE_MAC_FILTER
@@ -1714,29 +1713,23 @@ void Mac::HandleReceivedFrame(Frame *aFrame, otError aError)
ExitNow(error = OT_ERROR_NONE); ExitNow(error = OT_ERROR_NONE);
} }
receive = true;
break; break;
case Frame::kFcfFrameBeacon: case Frame::kFcfFrameBeacon:
mCounters.mRxBeacon++; mCounters.mRxBeacon++;
receive = true;
break; break;
case Frame::kFcfFrameData: case Frame::kFcfFrameData:
mCounters.mRxData++; mCounters.mRxData++;
receive = true;
break; break;
default: default:
mCounters.mRxOther++; mCounters.mRxOther++;
break; ExitNow();
} }
if (receive) otDumpDebgMac("RX", aFrame->GetHeader(), aFrame->GetLength());
{ Get<MeshForwarder>().HandleReceivedFrame(*aFrame);
otDumpDebgMac("RX", aFrame->GetHeader(), aFrame->GetLength());
Get<MeshForwarder>().HandleReceivedFrame(*aFrame);
}
exit: exit: