diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e3dadda03..465dffc14 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -34,6 +34,7 @@ Release 3-dev - (wifi) - #942 - Trace expired MPDUs before removing them from the queue to avoid blocking the recipient buffer - (wifi) - Fix wrong condition preventing PHY from aborting RX when starting TX - (lr-wpan) - #944 - Fix for-loop in PrintTxQueue(s) functions +- (lr-wpan) - Fix incorrect return parameter in the MAC MlmeAssociateConfirm Release 3.39 ------------ diff --git a/src/lr-wpan/model/lr-wpan-mac.cc b/src/lr-wpan/model/lr-wpan-mac.cc index 93c0088ee..439a7abc7 100644 --- a/src/lr-wpan/model/lr-wpan-mac.cc +++ b/src/lr-wpan/model/lr-wpan-mac.cc @@ -3193,15 +3193,13 @@ LrWpanMac::PdDataConfirm(LrWpanPhyEnumeration status) switch (receivedMacPayload.GetAssociationStatus()) { case CommandPayloadHeader::SUCCESSFUL: - confirmParams.m_status = - LrWpanMlmeAssociateConfirmStatus::MLMEASSOC_SUCCESS; - // The original short address used in the association - // used in the association request - confirmParams.m_assocShortAddr = GetShortAddress(); - // The assigned short address by the coordinator SetShortAddress(receivedMacPayload.GetShortAddr()); m_macPanId = receivedMacHdr.GetSrcPanId(); + + confirmParams.m_status = + LrWpanMlmeAssociateConfirmStatus::MLMEASSOC_SUCCESS; + confirmParams.m_assocShortAddr = GetShortAddress(); break; case CommandPayloadHeader::FULL_CAPACITY: confirmParams.m_status =