From 7dce23fbd3574ffca01af421abd6762d3babbe27 Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Mon, 7 Mar 2022 10:55:04 +0100
Subject: [PATCH] wifi: Align TXOP limit for VI and VO to 802.11-2020

---
 examples/wireless/wifi-80211e-txop.cc         |  19 +++++++++---------
 .../hwmp-proactive-regression-test-0-1.pcap   | Bin 8608 -> 8687 bytes
 .../hwmp-proactive-regression-test-1-1.pcap   | Bin 13200 -> 13309 bytes
 .../hwmp-proactive-regression-test-2-1.pcap   | Bin 14710 -> 14764 bytes
 .../hwmp-proactive-regression-test-3-1.pcap   | Bin 12973 -> 13052 bytes
 .../hwmp-proactive-regression-test-4-1.pcap   | Bin 8304 -> 8304 bytes
 .../hwmp-reactive-regression-test-0-1.pcap    | Bin 9431 -> 9431 bytes
 .../hwmp-reactive-regression-test-1-1.pcap    | Bin 13555 -> 13555 bytes
 .../hwmp-reactive-regression-test-2-1.pcap    | Bin 15330 -> 15330 bytes
 .../hwmp-reactive-regression-test-3-1.pcap    | Bin 14928 -> 14928 bytes
 .../hwmp-reactive-regression-test-4-1.pcap    | Bin 15219 -> 15219 bytes
 .../hwmp-reactive-regression-test-5-1.pcap    | Bin 11537 -> 11537 bytes
 .../hwmp-simplest-regression-test-0-1.pcap    | Bin 77751 -> 77751 bytes
 .../hwmp-simplest-regression-test-1-1.pcap    | Bin 81147 -> 81147 bytes
 ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10886 -> 10886 bytes
 ...hwmp-target-flags-regression-test-1-1.pcap | Bin 15774 -> 15774 bytes
 ...hwmp-target-flags-regression-test-2-1.pcap | Bin 14184 -> 14184 bytes
 ...hwmp-target-flags-regression-test-3-1.pcap | Bin 7754 -> 7754 bytes
 .../test/dot11s/pmp-regression-test-0-1.pcap  | Bin 879 -> 879 bytes
 .../test/dot11s/pmp-regression-test-1-1.pcap  | Bin 879 -> 879 bytes
 src/wifi/model/wifi-mac.cc                    |   4 ++--
 src/wifi/test/wifi-aggregation-test.cc        |   3 +++
 22 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/examples/wireless/wifi-80211e-txop.cc b/examples/wireless/wifi-80211e-txop.cc
index a279d81fb..412249d21 100644
--- a/examples/wireless/wifi-80211e-txop.cc
+++ b/examples/wireless/wifi-80211e-txop.cc
@@ -49,8 +49,8 @@
 //
 // The configuration is the following on the 4 networks:
 // - STA A sends AC_BE traffic to AP A with default AC_BE TXOP value of 0 (1 MSDU);
-// - STA B sends AC_BE traffic to AP B with non-default AC_BE TXOP of 3.008 ms;
-// - STA C sends AC_VI traffic to AP C with default AC_VI TXOP of 3.008 ms;
+// - STA B sends AC_BE traffic to AP B with non-default AC_BE TXOP of 4096 us;
+// - STA C sends AC_VI traffic to AP C with default AC_VI TXOP of 4096 us;
 // - STA D sends AC_VI traffic to AP D with non-default AC_VI TXOP value of 0 (1 MSDU);
 //
 // The user can select the distance between the stations and the APs, can enable/disable the RTS/CTS mechanism
@@ -97,6 +97,7 @@ int main (int argc, char *argv[])
   double distance = 5; //meters
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
+  Time txopLimit = MicroSeconds (4096);
 
   CommandLine cmd (__FILE__);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
@@ -161,7 +162,7 @@ int main (int argc, char *argv[])
   Ptr<QosTxop> edca;
   wifi_mac->GetAttribute ("BE_Txop", ptr);
   edca = ptr.Get<QosTxop> ();
-  edca->SetTxopLimit (MicroSeconds (3008));
+  edca->SetTxopLimit (txopLimit);
 
   // Trace TXOP duration for BE on STA1
   dev = wifiStaNodes.Get (1)->GetDevice (0);
@@ -378,30 +379,30 @@ int main (int argc, char *argv[])
     }
 
   throughput = totalPacketsThroughB * payloadSize * 8 / (simulationTime * 1000000.0);
-  std::cout << "AC_BE with non-default TXOP limit (3.008ms): " << '\n'
+  std::cout << "AC_BE with non-default TXOP limit (4.096ms): " << '\n'
             << "  Throughput = " << throughput << " Mbit/s" << '\n';
-  if (verifyResults && (throughput < 35 || throughput > 36))
+  if (verifyResults && (throughput < 36.5 || throughput > 37))
     {
       NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
       exit (1);
     }
   std::cout << "  Maximum TXOP duration = " << beTxopTracer.m_max.GetMicroSeconds () << " us" << '\n';
-  if (verifyResults && (beTxopTracer.m_max < MicroSeconds (2700) || beTxopTracer.m_max > MicroSeconds (3008)))
+  if (verifyResults && (beTxopTracer.m_max < MicroSeconds (3008) || beTxopTracer.m_max > txopLimit))
     {
       NS_LOG_ERROR ("Maximum TXOP duration " << beTxopTracer.m_max << " is not in the expected boundaries!");
       exit (1);
     }
 
   throughput = totalPacketsThroughC * payloadSize * 8 / (simulationTime * 1000000.0);
-  std::cout << "AC_VI with default TXOP limit (3.008ms): " << '\n'
+  std::cout << "AC_VI with default TXOP limit (4.096ms): " << '\n'
             << "  Throughput = " << throughput << " Mbit/s" << '\n';
-  if (verifyResults && (throughput < 35.5 || throughput > 36.5))
+  if (verifyResults && (throughput < 37.0 || throughput > 37.5))
     {
       NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
       exit (1);
     }
   std::cout << "  Maximum TXOP duration = " << viTxopTracer.m_max.GetMicroSeconds () << " us" << '\n';
-  if (verifyResults && (viTxopTracer.m_max < MicroSeconds (2700) || viTxopTracer.m_max > MicroSeconds (3008)))
+  if (verifyResults && (viTxopTracer.m_max < MicroSeconds (3008) || viTxopTracer.m_max > txopLimit))
     {
       NS_LOG_ERROR ("Maximum TXOP duration " << viTxopTracer.m_max << " is not in the expected boundaries!");
       exit (1);
diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap
index d1e8c669b5a3b7841d024f6f3650910ae4dccd0f..7bb053ac4b2fa894dc4b5ecf85c119b91dc1c65a 100644
GIT binary patch
delta 544
zcmZ`!&r1SP5Z*WL53RHZX({g7T159q@(?}2n`jXI3qh9-78C|Xgh>#kyG+ul@+K11
z!H6zFhw^ODp<Ble5kkif(R(XY7!AyuneWYf^G!9`PFiblsoA+S<TSgPfNKriBxU9`
zNf<aUfA-^&G{d9tmLzGoLeg-j;w^DT08)_Ga267r1})G9&p8Kq=LclP-;zt`i*VPK
z=>&#Bc@<s<uq@A0ub)VaQwwiNyzO0P<`oBh91#8}<vNN8FC1(7aZVY5%>X9|*=-dM
zlu5cZ*v0dtFn}T68Nw5)Hsb0Ti1jb-rU)0FjL`e(sqm^%=~<@&rC~=R4Kq9r`#K22
zx9^n3w&6#u+nHdrxA+%y?G*tZh@r_`@=XcQl1(h=6ZE<Ct6AK8ue0b*8UDFfj31T-
zRnTrL4%?_D*m$Ypq7m!2yZBBG=BnAwa#c)^)zIn-Dk2?6+aJZFNEN2)nDutR5-ta#
SxG`KM1&o*msW+z01@Z;D)PWlS

delta 518
zcmaFwyuf)v8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+Mi1QNX#3=DQa8iX$}9AKGT
z#OTA+!ZP^)BUlR)lNXZ>>tsJB2cR*NCosu?%vlE%1giYSQ~;98VU__}G`Wk}7ed)j
zmS8DmJ}byLnNe0@@&*<of%k%p4E8|tLHGg#Q0*rcdxaT7j0}800T8~zU;%L!Baj0I
zD}*KovMMnr3WH3MnEYRseezURV}WE5G?Q+y+A}_x9Kb3ydA<PKW(&5pOdv-*=QswU
z)^qxTT>X!8Dv-B%Dp#cdNK`-?>`(z|`^od9`5+?pli$Lb%nO>CCSPQfWn%%lWJ}8=
z*<gWdElj8$NS3u%tZQY$;Q^4wzE+SS5)<FEPJSTE!X(u;Nmdf*4Qu{(G^0G_>;?Eb
zkOVn^ZUhQ4_je$ip|O1O1Re=ikilA$CyFReej~Sl$!g`~0$zyV#L0!Cij&XCFJNq&
PoU0(qxMp*=LJA`Q@BVl)

diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap
index 4bb587e50cb6e3385c81e6caa6a86a5eb1c54c41..5d12564672600512b3b550fcf48a672688611b91 100644
GIT binary patch
delta 837
zcmbP`{x^L>8PgW_i4{If73>p_IWX;DpUlDNrBK7p00K;45=baoFfiBwX%N1^z`#Da
zh|!1X2;1ZXj9@K|I>M7hnar7L*eCljIRFiuJb?*h;^cck9?(byW-pLj4zmmsP;VDA
zSnmyHu$&YNST2oaB1pqe78#HRaaJ#o%4F68kiM&|g&;FM*nA<B{p4$Gd?3}&*c?EV
z275eHx$tCtK849E*^LD%MHm_Efer=X3k*PwZ`kb>I)Q?GKmicG!cYP6A0v<h2ERlm
zf8>*61F=7gPR{2D77!IfGvpG7y}~}AAci6EKsqP3*^sl61?0vxyuKiZ{pOtt;!WZM
z^B(enc@_L%-f?~-y|jy1%wqw$0%T~%RaDu{>H@7&AoJE~fdgWlmi=TKZ9a&I{p4;q
zQ{ZGX6CwmSz&h*&=C@!9D!R8a;qVd28R4x=lP@yLs)E=dZCF%--3lT+`j{pg@X1fM
z(=itC?nkl+6#k7m_6pHJL5!dShd)UBnf}QSbd;E9OkkQ^z#%_bMc0IX0-7P|y7r1m
z6R{Wq4u6m#MH9iUWd*VCO`aex$p&J*TsC>Vyu##iy#-7^mrX8IkO0fePwrDtoE)yd
zfH8S;fTAQ=%x!X>qT*z8g9S`st0o5uN`SR5SUuTaNnx_M;R2?oYbFOOLPUSAo2;*_
Ku=%^;Ohy1_0=KOI

delta 798
zcmZvY%WG3X6vpqIdnY$8dUN}LCZ(F07F4Q9AK7FPozPVcty*zYyKteji;CD%B(9s(
zqF@sbU37O*DOgJs@()B5U0NR%7a|lyTolBWs1=+ufnaL}=J9=J&Tr0~Khve@(sh{U
z<@_k5dHF>a@*Kk~Co<fk0cO>UOk37Tz0=&ZY7Wk^Q7AZAV<rV42N{m1A**3n0;1t3
ztu#*9CU(W{2Ay}yHhCXx6YFwJY|1H9!cV805;}Q~ZeHToh`GgQi8&G)t8WV5hdjFd
zC6uM@sC&_#Xl3{`5yg1Q#fNUnpKN26(v{NOv~>24tHg{pJ#El@XQk^OWLlW<u?@d_
zhg>>uwG%Cl%i)y&qkSLgO<0MbqY0_eswW-Q!2>rOs&=Dgj7t37vO?;vXVkW5R6b(V
z%g9jj@T(>~he{#n$lJZq>Jh)#MZ8L%X-TC|Vdj`ucNE@k9OdK!{QqN9C&6bH0AI6%
z7$hA~1*|1vrhmVVr~Kg}?Csx)gp%j9*}Q*5dsZY`wET^SNG>mG;Q7enK2C2^`S))A
zV}|uVv?+5-P2i1EFDx}mW!qSa$IKf$Yxp=W@N+VN-8GyQQBE)S;2k0Hd4IsB@T`m(
t?-X8@5+4i%FtLu~tx=PH{}G<)5m*=u;OhpC%euQ;!Tw%Ry*#wa{sJltt~vk!

diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap
index 700b08bcd27b1434030ac4a8319c2801419b3729..f9b93200d75bb285f356fca0e53bed78fe2ef50e 100644
GIT binary patch
delta 1077
zcmZ`&O-vI(6rP#g?X(#CqX=!FvK88*2W*QJG}z_bltkk}O+2Vq4~QnFnjRDa#`wqj
z!oiDa4@%S;LuwEcjRy(gph>IN7*8a4(U4#-#-sD5rK}V;nc11|z3+S9d+q+dkiR%}
ziM`<PizduDr=I2nA1ZgTmHP=96mMKbGSAKLNk%wC==mB6mZ`IPOtCbF1RG-W9Imn?
z%W!zl+A;elOR)tT3@9>oMUk;Z#YEmoRq|$38T+9o^-R@*vTk8)m5_wE;3^U!cTAIV
zIZaYlG%2^=HjQ$Nwqdlfix1)LIG49aT*eOD&!*maC~*oQT%Sp;lqN3n$?UL37i<!&
zN0U40KeK>6j=`R}W-Dd$_^!23Vh9ynMIs#Ca~QfQzzq*I3X`?O####%$BK&fzc{7+
zplcd?dhKdQ@S975d)+bjzLG`VE@J20hJHwZ4eBbYV~M9Fs5pF3R5cr3-+qLg-3P`&
z4o**R&y7!8aAp6PoGM$&VKXBhLq8?J|CjqvUN2Wz_1xTz{x3(Q|D}lhg_@$n3F`#V
zXnveEN=g?P-8R8CMv6^0MU6n402^G$ks{^R1cOoPZ^pBCauYoiGXmWLY@lN{!R`Je
zgEJ04$Mc&z4A$IUSc_^cgq^0_=~$4^j{2WfQNd|%i(%^ZyIY9L4-2Cq)8Ye%`BM0Z
z3$VdQy^R@Dwn0_6-Raj*BnQts1CZ{`(pebo^4Snueh5=tI-EF=r9n6v^vT39j06KP
z(3e%lpKz#jw93@Sc{mc%!5hyiuksv9dKIobgGgA1Kk+Q>gG#t6YtDkZTQ7X=e?b2N
DZ8XuX

delta 964
zcmZ`%O=uHA6rP>zWK*=8#B3$e7&o4ZNSdT-_poLwcrmns6p`Ml9+hIPND;AOwHCym
z@a(~ZvP!g6VnrgJJP2Yh8eNUvh4x@;1rH*k7vGz-X&`lBX7;`Bec$`$F{R;Or*59%
zrv>~_a)sx*X$eN3B6r+AcQIz;Ny}p+qA;K5FI7k@Czna^MbT@&J=_wI<K28jzy+S?
zwt%-hPSuONhhI{`@=5HhPhzva0`dA)$(vFowxH%syJo?+V&UQvV>t|Hc?{+Hgp|7{
zBxO!Wxeos%$<6wE$wr&jP0?XZMh`WK?Fk&^l`uRF#bBmgQwHF#)*0NOFdc<yePU>`
z5{T0Uz6EUlCIW?U!a#%_GZg0FNy}rXe5l1ShcUUzU7j4La{A^CWXHhEi1Npl*DBe$
ztxG#!^-1zL8jMr&PEaP7g4xjGyM`_S#8M&0{DaA+E-H1PR>$9Cmu-C1!)x`W_J3HT
zR*sWu*H;_l=@QwnW5zN0fB9?Gav?mOAfI+x`n;N!ldYtCSKf-eF&WxA##e_#_A6;8
z*@4L>{W`@R<1nOb$rAni<uxkhLnQRoc!M~ZU&uJgDkhu6<!or%cZI~G;Hko(Sf6N+
zAb;PpPBMYXCW*Sg8xzu>pXev<!%!>&p{S5yu?R;D6J|PH{;WvIx_aZe2e7xzgzGz9
z-aZAH%~46%J`Kr@CJgR!`S>Fw)Uu@#%EVxBhXx0ByZl874sNO;KOZ9!fpd{oNOif~
WdO}Kqn%sf`!+_tB*0OHhRsI2sAjZl7

diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap
index 00daca2f9b6e4f1abeb543f41e744196ceffaf87..0d23240facef9d482cd3a75e4a596897b1fc112c 100644
GIT binary patch
delta 842
zcmZvZO=uHA6vt<0Cp%HeW-gYbCfQv<kR)x>7E}sm^w^Mq2N5s5i1k>CNGMonA^lMB
z(D)E)Puo^JRjE{=s8lL~w>Guu#Y3?N4}utb5d^>HO~9rh3-f07Kl6U?|7M;H{u-P~
z(&xOK&g+;huiEtmSVj*W<<Muu=sOFps%e!&(Rib_;VjM55e}2|0*dcx&K>0hKT}5)
zzI`Pmt7aS(LO67rdE|_lI%VC=Aw0w$Anp+>)F&xE9yN$mIXEgoy(dNKm_ckM;HVN+
zxE$ESgj<%j@z&Bz#x?U2k5N@`i0gW<x!(Iz-^&Gi#9G^7*vh@&D~7cGPyw5o4aMA%
zdN)+nBN)~yO|JSw(!H^D7=(uj!+<HpEtn4^EL`S3z(p2?VY^Qhwi`f16@6(-cR-1a
z?ID5$Fktq^wgN?=mI!FrVpYRx2@V6{Uh%2g1oXqwy|dE-_}|&=4mw+ji`(tk_FPh5
z{#;VR>6DE(a4t11hD-F|9nk1zN_yi;Y;6?b`y~o9W(1vb{NJ3QkPSO<Gu<opCz^0C
z(o!r<Hi-DvO7t#IwWy)JW4Jy=?~C{;TwW`;IEWXf-=JfGgV*jrvBRh57oc`L0+~)`
zK3wEroN(Yur*G^+!i$3FV&<2}9QKrYrpu?Fm*B4#f$vKG`IN(Y%z?IyZybT$lToN-
Yn0a@Z!+hL<9~qx+JOf7^Uhe+=55F$M`Tzg`

delta 821
zcmZvZ&ubGw6vt<0cQc{7n>n<Q)FitrC?$z))1rn_GW8(Xkb*aR@g%u;C?Z9qf*zXw
zIF!=(D3s!1TYsEXlp=@<T0y*-r1j)M$W5@Af1n!Y&4MH~fq64|KR)mK-X4~omDW;p
z)~sZT%H}Jt?cf0+ZG?`SFs8+6*??(z-8SKt_FjhJJT20k2@7-rou6sJ9XAR7bY-Ra
zbwEg7-gs){g8^B+h@5-6D%sTw2)B%N#62>mf=lpkJsJ_R22U-lVuH^f(}*n{c)k+Z
zxMDW2U^b*=d<-e3!4&f{i&NQehN*t<n2P-gVukPs_j@~GJ1gP02GS<2DI99Uio3aB
z8Y=q{G<UxoQ8j4^_jI)rgvrD}gC*yxuw^Dg`0S~{1tSJG>@jZD+dxD%ePatZA)W2x
zA%Z9cSiM@8pcpihrh;ADQ?O=|!PUqp_xFwf{fKZc?RNqGQ#QSi%61a`PCt&lnNrK&
zObHlB+qi*TdWl~z)6VZuO$%>MI=c%+_|GzhH9d+-8U8=JNFg6_;AUo&Us-I!;oPq>
z!fQ$Ae>f!*O=OAQ=ZRDJEG&0P#NDWM4{tN@`W^Um#-|h8(Cmw<_75I1&`vn;c+l4x
zko028d+>xoLwXm6eEQ=lw7eks@HvCsxC5nOUpo%pPX@^=FBohk9JrYEY5gTQUKCo{
G-+uw&*sY@g

diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap
index 64a107b9abd67751ba46b1f4ef27824ab3194db9..6493dad226bffc886eb76953445a0da5f3b924e5 100644
GIT binary patch
delta 451
zcmez1@WEk%7Sk5?i8=*LHS81T$uJ#Zo47}YX$SknTX{h7$zF`U5Xye?4Msi~Q=RED
zi1~-fhp7UnhS>qAVR8?%7toB!H<)FZ7}zI&WA*`>HQ9v)EZ4>YlG}WV#fTZCk&VM%
zK<gqSgFOQS7+>Ik2r{p}$T*o_T9%CoD6#+2<OQ6PljT|2C*R^Q7I=6GNj(Ely)37_
zV&`Q>20ox#5Wd1t!49Mt7+66B$b^}fL8eJ?!v*xN0F4Y5@VSa+6f>7S^VzFlt2ZZc
zNeO`5SSJPcd7YH~WFF~ukjPYNdxbU4OgJoL0b01Hc`~20<m4C`PUff<rpXIA<tMkx
z7z@O<G9kPQa{4J5djW|yBtek>fr3mk+kgfrO@1J(G}&Kv!Q@3EQmi0z7fwDXqBvP!
ZZULj|<O_1Lj1wonlRL<`aPkKE0|0G6b436E

delta 451
zcmez1@WEk%7E=l9M4bXA8`g>QWSCl5Chn18s$iXXD-S3>*^AK^LfKEg!N><=sxw^%
zG5;|6Fj)ZAFgpM>OzvU!0-7=T2D1#)0hY<%n0<g|O?F`c%eAq9<ThVoF=7U3WaF?G
zcy*4E!JdHuj4yCN1evqXGfw80mStlCO4MJNyns`3vOFvM<XarZ0t+u7sb>JHm*uoq
z^t{N(zz0+d!dDn9Sb-D+1DFJv5P1<~nglmo;N3-_k--8ym(h%3=CWt*y$rT`a}t-7
z0LYDXQedCgN!d^4k!}ZxOqI45_}9#Y>S~~%!m<`79Ijvix?)?)WIk!h$-FY0%m-ST
zCNJcapKKvxEO59D$s~|}s%7k%T-t$Zl^8W9KNMD+>@T~3F=z4zSy{#<lMjk0PS%%O
Xz-Te~f}AYll*#Yp4gy6t$R7Xz2CZ&j

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap
index 2ba9109b0f78c8411be205af719177b98371c452..2de0d9a5a9ef57e717b25796954579ffd7e4162c 100644
GIT binary patch
delta 485
zcmccadEIkD8PgW_$r~8$CT`<{vIK-I7#QprAov0YL|Wh%7Qx927@?Ycpn50UFu{zO
z+y!AyV6mHg1Hn{d1}gxH3P{{Uvj-%ody9d=25315Utrk5KKT-}7ZU^fWI2`skR20P
zz*d0_m0{&$s$ie2!|K2URF=o;#Z<#Sc^9h;glD7o=^g_EAJ7yKzQRz$4x|_un7|~E
zn0+6~at5FUPHa9*N7yD$U;`T`$8Iy3kDU)>mK?hmgtD2u3?^bD;Px2R^vO&d6G0A~
z%25Dv2Ro-P<Lk|#ob}8K6%d=5Vb(7Pdd(il0pSY_KrLT*e1RU>?95vvr~q{)STQS5
v!7L3<27Mq6!WS4$uur}!XRFYI<QI@4J56LoD(sVu<ZYQ=ux&1sPh$lDmNsik

delta 485
zcmccadEIkD8B+=C<PD5=6Swg}Spq^93=DP*5PX3HA}#O>i{Ru1j8IKJP`#6Fm|(_C
z?t(BUu-Hw$fncgJgB1Wp1te~w*#i>Py~V&_1GF53FECWFPQJwK#dLsWvK&hR$c_mt
zV5>le%CPb=S+GvlVRc{vD$8T_VzObKyo*%^!n4u)bdQ074`>PqUtzFe1yT$QOkfg7
z%)XCgIRnrFCpI6Z7M95q*ucigvD-}MW9I{zCCBasp=>5EgNfJ(xIIQSeKHfrM34ig
zauk5v!OrQ+_-b<~XFaom1;l1%nDxtnUb6>sK==X!P|Ft{U!X@eJM$I^DnOkHRt(ZN
tOM{a^A4r4n1%?jR$yeoU6?~BV0%F=}A}e~rGTBJpmT3jc=0f>2RsdvVWW4|Y

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap
index 21381af29e3208536ca880f98757b84a5fd19924..15aa0b47ea86f80ac85bb494f64ffe59d8d11f25 100644
GIT binary patch
delta 496
zcmZ8dJxc>Y5Z#;m*a*pyLPEd;qa@8;E=n+sCNZUi2=Nz)WlAmNgu}|x!Z=_l7AeF^
zh=pJyDA7u;P!x*;K}CqBNn`2Go<(%w?as{ZynXYAtzm0#6V7<sYk<ewy&9Zzj4Abu
z&lxR{yV$m#8LNtu5HQAZLutUZftN~6v?BoZV-qAn2xYtjlej{tgU``cEf7shs%$z?
z<+CSM-et9-+UPTUanpEI;OJ>Hh14fwrud3*&%8*CCK9>c#BEtbgn)@(9<*}u@avz#
zDZL7l16<RmC*B96bicDjbhtX6!z;Zar!b-^3@LBlkn%!fUFmn5d`{1d>L6!2^NcNu
zlMparLnppWHVos^lv0AS?oQ&wA}eNX$>-Y^q&coQF5cKCY#S6NE4eY|3K~KXd(~y}
z@lUZ%#RWLkWbcJzLMjTs9aHhK=@hV(FTyRyR=xte9FOxBWI6Uk_F;5&cffxD^saS=

delta 497
zcmY*VJx>Bb5S^RbJ<z~~!otKW&`5J|XowJ^2T~exCin}Cm7zmp3?`Nomf$2-78Vr5
zmePjA1UqwuAH;&h#0nJ)8cTQgEMSw_otfSD_RX7AC)MUDp72)P!#r>GOIYU=*2;00
zgIuU~v7NmE6vZjShaRJ2&BF$xo>mfYLX>!_pduKeOOI$ut|6Au<z(v?3eb+OKv%kY
zHqh1GD$D5CBcOL@k#5o<s<XB9;U|D8zLN0-`9KU4g<82U09Rx(d=S4pGdK1lnllQQ
zc@b;hbih}Za^q>b|JedM+FwY}Juj#!j9>~w$-6X^yrFTVjk=Z429Hnckj}I>0k*{{
z!v|qQJF+Wnm_(E**{H0#jp(f<tys4e-??q!fYDykp$FT<qDo_h#2h$+Mus15>+(MK
wI@6q&%`L2<!rmoKe9=_;D^fQ|v#AVTaH^&X=yB?#Ec{^97gdLKxib#^0Y1lY(EtDd

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap
index e4d092b365a0bb8f39a4ca78207312de8c17bfb4..52f56cf5bbf20716b7a00c58aa3c66ec7ed03dee 100644
GIT binary patch
delta 824
zcmaD<{-}IH8PgW_$r~8$CT`<{vIK-I7#QprAov0YL|Wh%7Qx927@?Ycpn50UFu{zO
z+y!CIVggIfVzQg8#tfDOG6lBYK(hlR7<ZF_fe&ag2w!2SV4r-6*@0;X`(zOoFQyvy
z$q6hnObqOk>sWl4j<8KW!vdD$WAy?l;bXO#JdKqP$`tr_mw~|sXbK2l;DE~Ov4Q37
z*t|f-bg>n{G+MC3HEKS>qVWPdpI{9;&?p85MlcB^ZckolsW@4HLto(5Yb38Q0E5e)
z!%pE9P!QQGU~Mcg&CzcrzZaIAe1MBnp!N-tg$zKK-siB<Q+kW68)`K(Ot%qG79Kwg
zK(Bam+9}*Z(Q<?htQfB4)mw;#oSXtH-=SG}lha0FCr}XKT&RU`=W4x&Id^h67dQ&j
zxe7ora+6C&0csU1%ylusjEJBIc}SEy50pAuxqX-_*e74+21lDH4>(E_c?ua{Prl3(
z%J_P-Ca*IqNJXBI3`l*CkS~aLTgU;#lNAQ@a)d#=&Fh4X6+n^q*cfbzzKINz1p8!1
zQ{Bl`CVWhFY+&YgAoB?;h$+yl%E_P$bRY;{;P8S7%Bmp?ZeRhbv}O_mQM!{?oANQ$
aFoT&dOpTaMuuqmTvt?3Y-yCh$&I$ljlE07u

delta 818
zcmaD<{-}IH8B+=C<PD5=6Swg}Spq^93=DP*5PX3HA}#O>i{Ru1j8IKJP`#6Fm|(_C
z?t(C9F@Ys#G1*O4V+KnCnF3pHpxFTujJwIezz4J#gs(7Iuui_j?7&pPI$4Cpi^+y{
zasrDC(*c&rbu2ziEi9AIuz=<GSiL|>_*iWwPh;hSG6nwKWni!YngYTXIH2-+Y+!ji
zHZPDdU2Fv~jTY>1jhc_JXuQDA$7{n1G>U<N5ll{IG*_K0z@aao{Tj&|48WlB=de?-
z1_~m31FVGwOah5DuP473mYjTmi&NknP$Arv3_w@j=djT$dV{PRYArKNcN0(+9ybg?
zZ+LRrDQLe%*3ts83a-WaEyO}jPJv%Qg(w!@<g`)XdWWnVY9ZXY)$d@=ogB^uj=prR
z0#Iz+<dRW<S_KIjpc7++8Bxs_<<0}8j8<+RCJWZdm$|`FCdvbj&P1L<##fUs^Mo?K
z+N{az%nDMGCnN(>-y`G;;@uW<0P$pn!Mq${5O4E3VPgeQ#630!o1$+b!+2w|gQ?!+
zDic0NJ1}dz2_MrE=E;txx&qCroD8}^mx1sF4lanGtQxXl0TWQAHPbalkcP>tP5GE?
ZAj}u0Mob;7lV!|onVzt0jy7v&1psBBvpxU-

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap
index 7530ea0ab4538794c0776bdeb95868cbbee78b32..fcbbbc4fb4fc5e65c79e22f347255c64a31fa0d9 100644
GIT binary patch
delta 910
zcmZWm&r4KM6u#a!^X{EDGF^=#<AIMBErJOdGa(<32|+}rbR9uZtHQ(q7YZ)?1B9kd
z%h0V94ADfmXrbVu#Kj|8w1{$(LZcEyQ4rKQ_ucnna&hnd&Uemt&bjA=bKzX$0)HtU
z@!;XTk^$=mfZb(~n!LhTz@igM9k1MxV;p=liW;VZ>wK0k3fSN--?HHoKI;Ph@EP(=
zTRLRg3gDMTRgei_ESJE?xeAHj<Xmsd#>$LwedA?)WX#8xPRKClRNjYbzC`J#@)ObH
z!-tsh)%I>iA&p|z)`}%NR`6OI95Jb8+L@0rZ0)WHyweAam9QY4_iSF^!&pw=c%46h
zP1y&#qM*KDU`Kbqg@5r!hk7wmTd{iOFk6rbxFZ9viDX*P%pj5UA7R0B>gv&d#lB15
z+e0!{nqo<-KS`-ug?ix@P5xb>#^(iiPL)P?+nJ!jHyxK_Cp%7!mUp(OeK(8Rw}uu9
zz83XHW%p`VyS3ImnkVwG$EBRb-fLvt=&h3VB(mDtYL!o(>ZeMLiVsT_y@W<ZFM*gd
zgNE_d>t&galGaB4=aGM7Fj0(OD)AiwCx*&u|AAy>94nnr8WI}EN%$L!MvN8~hT=5v
tDuHURnGrM0SRXFKz-1ju@O}!Prf@%j>g|h60%{3W>RGFkY}JQ9^M7SL<J$lL

delta 909
zcmZuuL1<G!5Z&(on{0kcTq^}F9~wLg5lL-Y?D7c+K}xheiy-Jhlqv}X)LRcd7EC)m
z7J4l$6fqzkMB+`w!$&-L5beoAVpQ<bf>3AnZ+?EQhuwMeX5Y;0OxOq;&2zjVR(Y^;
zFK59E3m`RQk(#^2SiqtaO7mX%GsigiWffIS1=o0uYXNQU^CcI)pm`+V4}U<h1;;#D
za01wOs0uOxRNNS@xkVDcasB*~i<KGU=ElqU%$P<?CuEp&UT7$b9HpNZvysv8sn2Nj
zZa1NjR#8hC#bT<j;Oiam(sSxnC-E_ct=&xr`8!?4a#)bgM>Z|cFcvk2;9(bD%QLW>
z&ZyG&L@ny>Ag#|=kQ}IWq;^aWynbRdo-S*<a9alX!y^(qgIH4QVZpO%wf9f4-%^j4
ze*C9c+-e2da*R5Kdgdk#{zIn9rv>D_GEMH5H%oKh@qCVry!WcKyRoc^-N>5QCVD97
zWX(e5@WxQ5wK;rQ5ZOEFQ_k$jRr0Qnl*wC<ysq(Dg;S&BRH<3iuvj!ZXco;5h&erB
z8LeI}%fX&$YZQMP#oH6H;>yJwUlwp;vY_^!NLIjs(g~#{p?REy!@g+7YT@x@KMg#O
tq58Iy5HrkJpDMtGl6gw-{s3+b;9d;X+h>Uc)Do)HcIznFs!x68e*s#1(%%38

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap
index 56deb39d14d4ba2f1f941758c3dcaa11445b01fe..2f0fb8e623fc8f58504bf22b4ca33e77b07ec3e9 100644
GIT binary patch
delta 437
zcmexd_PK0A8PgW_i4{If73>p_IWX;DpUlDNrBK7p00L}a5=aCEF)-KxX%N1^z`#Da
zh|!1X2;1ZXj9@KHOkPYi?34YNj0A4IMpn6neewh*JErJ2lP@qS`6#_*VBiCq0K!)o
zpms0=Ibd)LMfM29Zn*5qcMJ?RKy@H|fdS}DJ7yaut@j{vC(mP!2YO=ie`b&`Ci}90
z-PF$lcGGPZ87826CmIM(=3%u2x!Ii+EZ@lrmcPnc$oP7*JKKF0kP#Z(z91vYxg9{f
zoe&-e4~Vzfi)WP*D15%@!NZ3Y<ZuwtaGae%7f6Hf1qKO_eY%r-_4%0U*uczFK;{!x
qFq7SYkI4(n6nJqGNf*Zk7LdF^(<x*@F_54&Qw=jnZu4)03N8TYmS_h6

delta 434
zcmexd_PK0A8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+kq1QJ0(3=DQa8iX$}9AKGT
z#OTA+!ZP^)BUlR)lNXZ>>tsJBBLVH#$SO-%Cr@CqV_Nfi@&zU(pQ1Mm417QnK==v+
z)DC7K2Mn~|BFnb0fCb^QzksqfKp_ymzyNfn9kUHn^*fNcljkwV13fYMKQqV|lYLph
zZt7<NyXiKI4C8^x6AVNq^RQZiob1jDmhNN)OJ8LzWPG*Ro$Wpg$OH{;Uyupq+zue#
zP6&^K2gKX##j{EY6g=PbyyT%y2L}>}XgJQ!pbMly_yWTXpmlnad-eGk?ZB*4`g}}F
wm?uv((4EX~z{kV|W(vGGiKK_4fC(fo&~yq}@ERjf(3;5xMCoq+ZBW4l01k0u5C8xG

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap
index 74959bcc60982ae0aa3c1ca6d25d44b2592f6d25..507039f6a144adfa96a507f569e17d96c9d71a1c 100644
GIT binary patch
delta 248
zcmbOjH8E;J8PgW_i4{If73>p_IWX;DpUlDNrBK7p00L}a5=cA^WMHrZ(ja_+fq{K;
z5u*>&5w^((7{OYYn7o*3*eCljO#~V<`5}`G$ejN`L7+-+<^rJH=Do~H%s`taKV<U-
zsWD)80P;2$u`5V|)J{<V8}L9uhDm~bvc8h;WNk%0raCq-GeeP&@yX;ucHzkaiqiax
sPO>xT0-XWE7dX6N;sQ3Oki|E!fVIji@iB>knAS`+%pj4?GnFd10OaC4d;kCd

delta 243
zcmbOjH8E;J8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+kq1QJgJ85rz<Gzec{IKVQw
zh|!0sg=O*qMz9tpCNCx%*2#WM6M@D|e#j&PGUq>&7vq7+9~DI=$1%qOr8n<oR$>NP
zHu)i&FG!gIy91E7xrkjs5~O^J0@#cP3Nnm0fV%W1Yb)|G+JRXaihN8<m?!Hi=?W}5
t$<Ck)bOZ=r;NXG?+MGfbEMNkuoGh=z$8?Pm$h2m%0a3b}XDU^20RUPrJE{Nx

diff --git a/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap
index 32b58d0d04e83a1333591bca27e602174bafce76..664ad59546c73594212957f48d758e3fd1cd45d9 100644
GIT binary patch
delta 230
zcmdmfpJn@fmI-A{Ti7R7_%KzlPdw(pw1a&z2cwrl4Lbt}Fo8)R(QU!NU<af@_yPk1
z`{W`<AEqO0lMgV0wJ<SxG1ahd_G8jw2AVdxiq#ir+~$+4clUz0D-MIX-w#)(Go4|d
zzEPV|SK!B0b_QLbVIX{g10re-lbtTD!^j8cL?Cel^lxJ7(-q*jg++8bzb@knCIIM;
BJm~-c

delta 230
zcmdmfpJn@fmI-A{C9D%Ge3&d)CmwTPs$iYW!RV!6!^!{xOkfg7bXzbm*a2w}zQAyR
zWpWXt4^s=v<O7UgElf;aOg5~W{g||vfu>EaV)X?YxA`RN-Mt|0io;;;_rulcOg*gA
zH)=EL3jDar&Y%l441_OmKt!!!veTt?82R9w2qcbx{!L7Mx&j=xu!wHw*JWJ61OOA%
BIRXFx

diff --git a/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap
index e644070fbd9d8076db997e6d3d4d447a0be0608b..c04cb9bd5d8d0b27c8d822097199f9f66f94ae6d 100644
GIT binary patch
delta 221
zcmezUljZkMmI-A{Ti7R7_%KzlPdw(pw1a&z2cwrl4Lbt}Fo8)RA#cIJU<af@_yPk1
z`{W`<AEqO0lMgV0wJ<SxG1ahd_G8jw2AVdxiq#ir+~$+4clUz0D-MIX-w%ryF`Z$b
x?r6@aJKffdkq^$PLgs8o;s^+TV_?t)+6lrJIG~yZzG4xzhMBf~wK-z|D*&%YI!FKj

delta 221
zcmezUljZkMmI-A{C9D%Ge3&d)CmwTPs$iYW!RV!6!^!{xOkfg7$XhTl*a2w}zQAyR
zWpWXt4^s=v<O7UgElf;aOg5~W{g||vfu>EaV)X?YxA`RN-Mt|0io;;;_ru~vOg*gA
x9nBear`wt_^1(S($eis+90B2P3=FzJJ3;sY2UN4bS1h8|Fw?fLHfIcA1pxVdHemn&

diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap
index 8be1b42e7082d9f92cc4a1f9c193c17a75230ba5..bc55ea3db79ec824393f393740f7c91145f0759f 100644
GIT binary patch
delta 194
zcmZn*Z3~@H#<YcfVucS=1^dKf4oo}PCvz}*Db%ntfB+Mi1QNX#3=DQa8iX$}FtAT9
zV)S7;!Z!H;BUlR)lNVDB`(!^R2cR*NCosu?%vlE%1giYSQ~;FQoWp#AS)l@AEHlVh
zklCmC85rz=Gzec{*up+Jgxwct!sf;7eLO&CO*R$*bDKoWnLq~b7Lx&q-V_6iYKX@P
F0|1<&EMouw

delta 194
zcmZn*Z3~@H##F*OvBHPRf_36C2c`<v$sCMc3O1|^AixABfkdwb1A`rq2H^_~2UsQ-
zG5RpIuuML{2-d>H<i%veI@yoO0cgzR2~08|bJhU`fhvD76#(Tn=P;jOR<M8=%M3CW
zWcF!(1_pZ|4Z;@~N?0d{u=@f{*u0p%j|b?i$;KjJZj*>P6UgA*Vlp7nn_^&54e>Z(
E0GoFyIRF3v

diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap
index f890372e3b3ceb62e6cc429d39204bb20eefc07f..0f7dbaf4191d6ef79b141d59a7faa95f59d5ae63 100644
GIT binary patch
delta 271
zcmbPNJ+FE~8PgW_i4{If73>p_IWX;DpUlDNrBK7p00K;45=baoFfiBwX%N1^z`#Da
zh|!1X2;1ZXj9@KHOkPYi?34YN9Ds&Rp1=e$ZSp-J4``eMGgvN%S%wLyuZtP1?*=ni
zPKpIAm&P&?q~Rxv3`m1Gs~1RRGHU@Z)EO*bXG}IUQ{BwU_Jajv$A2zgkQP5~h>hGJ
z-sbz<XL*5=o7YJ;GlLWv%YucQWLGhP6zeJ61Bvn}g0;pfg0;>E^ESUz+#n4AIZQ^F

delta 271
zcmbPNJ+FE~8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+Mi1QLoC3=DQa8iX$}9AKGT
z#OTA+!ZP^)BUlR)lNXZ>>tsJB2cTh-Coq9bn|u$*0~)8m43^7bmSF<w>tY7$yTJ^W
zlVSnOrLjx|Y52(^1JWSQ>IG7n%v!(;bp{LA8IujoR5!D-{a^vv@t?~Vq{WXLVk0+*
zxA{KzSze&z=5><I%pgU^vS8sR*;Py+#d-?&K%#t#V6Cx=V6F4Pyv^?vH%J2j?2SQH

diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap
index fb30a8da2febc0326c0e9679608f01f372d0916e..cb46d15458dad936f8f4090a634998f6c165523d 100644
GIT binary patch
delta 288
zcmaEn_abjX8PgW_$sZW)CT`<Xs9<LR0Y)$hB(9n>FxUWT5Wc{$gMH!?FD3@|$p(xC
zP)(B`F!Di|K1>ztlkJ!sn0ByFZea3as$rjehDipb`W2H8(-F4G7R+F|DrT_UG3JRN
zeUU6+eal(EaxYoD6lx$&V1_xN=?w#e9gqXU7Z`xX1+#*UTgVF5@|YE5+-7~YnJggl
zPI38y+#$*B0OW0s=C<VqiOv!OiEe%=Hk%nF+$JT-1QK2-0~Y=uqreE_3dw=>Cdz^J
JE|xng0RY{iO=JK7

delta 288
zcmaEn_abjX8B+=C<PVH?6SwgxSg<mH03(<L5?9R`7;Jzv2wz~RV4e8Hi|GK%WCO+m
zsHVve82KPfA0`Xd$#zT*Ockt?8<@P9Y*;6sVUhu<e#PX&)WR~^f*CAV#SE4^#yk<E
zFOmhUZ#fHC?j?(tf(^t8%rGZ3y<uRm19Cw40t3*vU{<hk3t7Qh9<zds+pNzvlLchn
zDK1}-J0!UsfV|Do+_u~x(OF_3(akT#W;26?+oU9!K*9@Uz``G76c|BVAvv(#L^-hD
I#d1d_0HQ%iApigX

diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap
index 4d36698d04e5cc38700228c685aa6f07feeab6a7..0ebb4197a0d1b5389658ce7485cb503e21b7e8a5 100644
GIT binary patch
delta 178
zcmX?QbIN9d7Sk5?i8?-D(r)4oJ_utn8>10Z4f|v(Mj56fY?C8^)DHH^WsLiQ(v!`Z
ze3&ZOC$};=fCP^-c`4MeGk^dym;@5<-Y_uO0cjAvz`(#h*^t=>WKKOZSj$0XFQDO@
sd0Cv8f#z)vWRGSAnY)h17ijM0zdX;GK-_2iV6Lfv0wYLOxZr0V0IXpzqW}N^

delta 178
zcmX?QbIN9d7E=l9L>(V6X*Y2PAA~WPjnRn7hIO(PqYP6E%j5_kRlz#BjB!6uda^l_
z50eG!<W?pJkl=A9F9jP`1`uEdlR)C#8wLhDAPvG77!I&ZHe~hznN!aU)^d>93uyRe
sUKS^2pn01E*`rxO=C0%M1)970FVAx(5ce5Bm}@Gazz9+mF8G-T04xtHdH?_b

diff --git a/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap b/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap
index 3c5eece19b9fa107f9ffff418dd4aa842d45290a..58e4d132b713f5a666c2ac4adc0e5f5355c83cf6 100644
GIT binary patch
delta 84
zcmaFQ_MUA*8PgW_i4{If73>p_IWX;DpUlDNrBK7p00K;45=eAgFfiBwX%N1^z`#Da
ah|!1X2;1ZXj9@KHOkPYi?3?|V6d3_v0up-w

delta 84
zcmaFQ_MUA*8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+Mi1QOjA3=DQa8iX$}9AKGT
a#OTA+!ZP^)BUlR)lNXZ>>t;VDMMeN54H0Sp

diff --git a/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap b/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap
index 5603af18353b28a2dd657cc72f20353c970988e8..3af641c1e794e4b4783bcd447d346f2d38e0850a 100644
GIT binary patch
delta 84
zcmaFQ_MUA*8PgW_i4{If73>p_IWX;DpUlDNrBK7p00K;45=h8fFfiBwX%N1^z`#Da
ah|!1X2;1ZXj9@KHOkPYi?3?|V6d3_dN)itM

delta 84
zcmaFQ_MUA*8B+=C#0noK3)YFp9GEItCvz}*DcG<wfB+Mi1QPNV3=DQa8iX$}9AKGT
a#OTA+!ZP^)BUlR)lNXZ>>t;VDMMeM;RS^CF

diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc
index 93c112f61..63167d152 100644
--- a/src/wifi/model/wifi-mac.cc
+++ b/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;
diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc
index b40f18693..5f8b5d970 100644
--- a/src/wifi/test/wifi-aggregation-test.cc
+++ b/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);