[mac] change RequestDirectFrameTransmission() to return void (#4941)

This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 1578346dce
commit 29c2d11170
3 changed files with 6 additions and 12 deletions
+4 -6
View File
@@ -537,17 +537,15 @@ void Mac::SetExtendedPanId(const ExtendedPanId &aExtendedPanId)
IgnoreError(Get<Notifier>().Update(mExtendedPanId, aExtendedPanId, OT_CHANGED_THREAD_EXT_PANID));
}
otError Mac::RequestDirectFrameTransmission(void)
void Mac::RequestDirectFrameTransmission(void)
{
otError error = OT_ERROR_NONE;
VerifyOrExit(IsEnabled(), error = OT_ERROR_INVALID_STATE);
VerifyOrExit(!mPendingTransmitDataDirect && (mOperation != kOperationTransmitDataDirect), error = OT_ERROR_ALREADY);
VerifyOrExit(IsEnabled(), OT_NOOP);
VerifyOrExit(!mPendingTransmitDataDirect && (mOperation != kOperationTransmitDataDirect), OT_NOOP);
StartOperation(kOperationTransmitDataDirect);
exit:
return error;
return;
}
#if OPENTHREAD_FTD
+1 -5
View File
@@ -206,12 +206,8 @@ public:
/**
* This method requests a direct data frame transmission.
*
* @retval OT_ERROR_NONE Frame transmission request is scheduled successfully.
* @retval OT_ERROR_ALREADY MAC is busy sending earlier transmission request.
* @retval OT_ERROR_INVALID_STATE The MAC layer is not enabled.
*
*/
otError RequestDirectFrameTransmission(void);
void RequestDirectFrameTransmission(void);
#if OPENTHREAD_FTD
/**
+1 -1
View File
@@ -180,7 +180,7 @@ void MeshForwarder::ScheduleTransmissionTask(void)
mSendMessage->SetTxSuccess(true);
}
IgnoreError(Get<Mac::Mac>().RequestDirectFrameTransmission());
Get<Mac::Mac>().RequestDirectFrameTransmission();
exit:
return;