From 29c2d11170b54a644d15ad17662888c33b2a213d Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 8 May 2020 17:13:13 -0700 Subject: [PATCH] [mac] change RequestDirectFrameTransmission() to return void (#4941) --- src/core/mac/mac.cpp | 10 ++++------ src/core/mac/mac.hpp | 6 +----- src/core/thread/mesh_forwarder.cpp | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index a3350d955..91c38ba4a 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -537,17 +537,15 @@ void Mac::SetExtendedPanId(const ExtendedPanId &aExtendedPanId) IgnoreError(Get().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 diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index 8f0392136..906bf29f1 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -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 /** diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 979c80679..6e24739c8 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -180,7 +180,7 @@ void MeshForwarder::ScheduleTransmissionTask(void) mSendMessage->SetTxSuccess(true); } - IgnoreError(Get().RequestDirectFrameTransmission()); + Get().RequestDirectFrameTransmission(); exit: return;