F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: (fixes #467) AP only records association failed when AssocResp is discarded

Browse Source
This commit is contained in:
Stefano Avallone
2021-10-11 17:38:27 +02:00
parent 1f894ae7eb
commit dba8375e18
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -29,6 +29,7 @@ New user-visible features
Bugs fixed
----------
- (wifi) #467 - WiFi: Failed association process
Release 3.35
============

6
src/wifi/model/ap-wifi-mac.cc
View File

@@ -962,9 +962,9 @@ ApWifiMac::TxOk (Ptr<const WifiMacQueueItem> mpdu)
}
void
ApWifiMac::TxFailed (uint8_t timeoutReason, Ptr<const WifiMacQueueItem> mpdu, const WifiTxVector& txVector)
ApWifiMac::TxFailed (WifiMacDropReason timeoutReason, Ptr<const WifiMacQueueItem> 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 ();

3
src/wifi/model/ap-wifi-mac.h
View File

@@ -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<const WifiMacQueueItem> mpdu, const WifiTxVector& txVector);
void TxFailed (WifiMacDropReason timeoutReason, Ptr<const WifiMacQueueItem> mpdu);
/**
* This method is called to de-aggregate an A-MSDU and forward the