From 9db5a061f4832fa72470f1bb7e519eb6d9affccc Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 10 Nov 2021 17:41:19 +0100 Subject: [PATCH] wifi: (fixes #480) Call ReportDataFailed only for failed non-group Data frames As a result of an internal collision, the transmission of any type of frame may fail (in the bug report, it was a Beacon frame) --- RELEASE_NOTES.md | 1 + src/wifi/model/frame-exchange-manager.cc | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f41611bbb..fc1d29ef5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -32,6 +32,7 @@ Bugs fixed - (wifi) #467 - WiFi: Failed association process - (wifi) #468 - WiFi: Wrong txDuration for trigger frame - (wifi) #475 - Wi-Fi: Assert when sending OFDMA DL to STAs with different TIDs +- (wifi) #480 - wifi: 2.4GHz remote station manager issue Release 3.35 ============ diff --git a/src/wifi/model/frame-exchange-manager.cc b/src/wifi/model/frame-exchange-manager.cc index 1fd0b5991..b92fbba1d 100644 --- a/src/wifi/model/frame-exchange-manager.cc +++ b/src/wifi/model/frame-exchange-manager.cc @@ -856,7 +856,11 @@ FrameExchangeManager::NotifyInternalCollision (Ptr txop) if (mpdu != nullptr) { - m_mac->GetWifiRemoteStationManager ()->ReportDataFailed (mpdu); + if (mpdu->GetHeader ().HasData () + && !mpdu->GetHeader ().GetAddr1 ().IsGroup ()) + { + m_mac->GetWifiRemoteStationManager ()->ReportDataFailed (mpdu); + } if (!mpdu->GetHeader ().GetAddr1 ().IsGroup () && !m_mac->GetWifiRemoteStationManager ()->NeedRetransmission (mpdu))