Mercurial Mercurial > ns-3-dev / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wifi: (fixes #2427) Do not set m_erpSupported for 802.11ac and 802.11n at 5GHz
authorSébastien Deronne <sebastien.deronne@gmail.com>
Fri, 10 Jun 2016 21:45:42 +0200
changeset 12152 0ca48e3ff8e7
parent 12151 7d98204b7876
child 12153 090887671b94
wifi: (fixes #2427) Do not set m_erpSupported for 802.11ac and 802.11n at 5GHz
RELEASE_NOTES file | annotate | diff | comparison | revisions
src/wifi/model/regular-wifi-mac.cc file | annotate | diff | comparison | revisions 
--- a/RELEASE_NOTES	Fri Jun 10 21:45:41 2016 +0200
+++ b/RELEASE_NOTES	Fri Jun 10 21:45:42 2016 +0200
@@ -63,6 +63,7 @@
 - Bug 2414 - UdpSocket doesn't call NotifyConnectionFailed
 - Bug 2419 - BsmApplication should use RecvFrom and not SocketAddressTag
 - Bug 2425 - UdpSocketImpl simplification
+- Bug 2427 - 802.11ac selects wrong slot duration
 - Bug 2433 - Bic does not copy private parameters
 - Bug 2436 - SendBlockAckAfterAmpdu is called even if the A-MPDU frame is not addressed to the station
 
--- a/src/wifi/model/regular-wifi-mac.cc	Fri Jun 10 21:45:41 2016 +0200
+++ b/src/wifi/model/regular-wifi-mac.cc	Fri Jun 10 21:45:42 2016 +0200
@@ -1091,10 +1091,14 @@
     case WIFI_PHY_STANDARD_80211ac:
       SetVhtSupported (true);
     case WIFI_PHY_STANDARD_80211n_5GHZ:
+      SetHtSupported (true);
+      cwmin = 15;
+      cwmax = 1023;
+      break;
     case WIFI_PHY_STANDARD_80211n_2_4GHZ:
       SetHtSupported (true);
     case WIFI_PHY_STANDARD_80211g:
-      m_erpSupported = true;
+      SetErpSupported (true);
     case WIFI_PHY_STANDARD_holland:
     case WIFI_PHY_STANDARD_80211a:
     case WIFI_PHY_STANDARD_80211_10MHZ:
ns-3-dev