From dba8375e18bec155cfe8ea57388b7a9bec27318e Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Mon, 11 Oct 2021 17:38:27 +0200 Subject: [PATCH] wifi: (fixes #467) AP only records association failed when AssocResp is discarded --- RELEASE_NOTES | 1 + src/wifi/model/ap-wifi-mac.cc | 6 +++--- src/wifi/model/ap-wifi-mac.h | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index a65678c7f..169e34677 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -29,6 +29,7 @@ New user-visible features Bugs fixed ---------- +- (wifi) #467 - WiFi: Failed association process Release 3.35 ============ diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index ed4cd2d1a..ab4a631fa 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -962,9 +962,9 @@ ApWifiMac::TxOk (Ptr mpdu) } void -ApWifiMac::TxFailed (uint8_t timeoutReason, Ptr mpdu, const WifiTxVector& txVector) +ApWifiMac::TxFailed (WifiMacDropReason timeoutReason, Ptr mpdu) { - NS_LOG_FUNCTION (this << +timeoutReason << *mpdu << txVector); + NS_LOG_FUNCTION (this << +timeoutReason << *mpdu); const WifiMacHeader& hdr = mpdu->GetHeader (); if ((hdr.IsAssocResp () || hdr.IsReassocResp ()) @@ -1420,7 +1420,7 @@ ApWifiMac::DoInitialize (void) } } NS_ABORT_IF (!TraceConnectWithoutContext ("AckedMpdu", MakeCallback (&ApWifiMac::TxOk, this))); - NS_ABORT_IF (!TraceConnectWithoutContext ("MpduResponseTimeout", MakeCallback (&ApWifiMac::TxFailed, this))); + NS_ABORT_IF (!TraceConnectWithoutContext ("DroppedMpdu", MakeCallback (&ApWifiMac::TxFailed, this))); RegularWifiMac::DoInitialize (); UpdateShortSlotTimeEnabled (); UpdateShortPreambleEnabled (); diff --git a/src/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h index 27e720bf6..14c6312df 100644 --- a/src/wifi/model/ap-wifi-mac.h +++ b/src/wifi/model/ap-wifi-mac.h @@ -162,9 +162,8 @@ private: * * \param timeoutReason the reason why the TX timer was started (\see WifiTxTimer::Reason) * \param mpdu the MPDU that we failed to sent - * \param txVector the TX vector used to send the MPDU */ - void TxFailed (uint8_t timeoutReason, Ptr mpdu, const WifiTxVector& txVector); + void TxFailed (WifiMacDropReason timeoutReason, Ptr mpdu); /** * This method is called to de-aggregate an A-MSDU and forward the