wifi: Align TXOP limit for VI and VO to 802.11-2020

src/wifi/model/wifi-mac.cc

@@ -615,14 +615,14 @@ WifiMac::ConfigureDcf (Ptr<Txop> dcf, uint32_t cwmin, uint32_t cwmax,
       cwMaxValue = (cwmin + 1) / 2 - 1;
       aifsnValue = 2;
       txopLimitDsss = MicroSeconds (3264);
-      txopLimitNoDsss = MicroSeconds (1504);  // TODO should be MicroSeconds (2080)
+      txopLimitNoDsss = MicroSeconds (2080);
       break;
     case AC_VI:
       cwMinValue = (cwmin + 1) / 2 - 1;
       cwMaxValue = cwmin;
       aifsnValue = 2;
       txopLimitDsss = MicroSeconds (6016);
-      txopLimitNoDsss = MicroSeconds (3008);  // TODO should be MicroSeconds (4096)
+      txopLimitNoDsss = MicroSeconds (4096);
       break;
     case AC_BE:
       cwMinValue = cwmin;

src/wifi/test/wifi-aggregation-test.cc

@@ -38,6 +38,7 @@
 #include "ns3/yans-wifi-helper.h"
 #include "ns3/mobility-helper.h"
 #include "ns3/pointer.h"
+#include <ns3/attribute-container.h>
 #include "ns3/packet-socket-server.h"
 #include "ns3/packet-socket-client.h"
 #include "ns3/packet-socket-helper.h"
@@ -488,6 +489,8 @@ TwoLevelAggregationTest::DoRun (void)
 
   m_mac->SetAttribute ("VI_MaxAmsduSize", UintegerValue (3050));  // max 2 MSDUs per A-MSDU
   m_mac->SetAttribute ("VI_MaxAmpduSize", UintegerValue (65535));
+  m_mac->GetVIQueue ()->SetAttribute ("TxopLimits",
+                                      AttributeContainerValue<TimeValue> (std::vector<Time> {MicroSeconds (3008)}));
   m_manager->SetAttribute ("DataMode", StringValue ("HtMcs2"));  // 19.5Mbps
 
   hdr.SetQosTid (tid);