From 5bd9704dd0b47b0fc1e0de5a53e88c4fba82303e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Sat, 13 Jan 2018 12:14:55 +0100
Subject: [PATCH] wifi: (fixes #2838) Fix rate selection for control frames
 when no rate available in the BSSBasicRateSet

---
 RELEASE_NOTES                                 |   1 +
 .../hwmp-proactive-regression-test-0-1.pcap   | Bin 7392 -> 7392 bytes
 .../hwmp-proactive-regression-test-1-1.pcap   | Bin 11737 -> 11737 bytes
 .../hwmp-proactive-regression-test-2-1.pcap   | Bin 13308 -> 13308 bytes
 .../hwmp-proactive-regression-test-3-1.pcap   | Bin 11732 -> 11732 bytes
 .../hwmp-proactive-regression-test-4-1.pcap   | Bin 7308 -> 7308 bytes
 .../hwmp-reactive-regression-test-0-1.pcap    | Bin 14503 -> 14503 bytes
 .../hwmp-reactive-regression-test-1-1.pcap    | Bin 21361 -> 21361 bytes
 .../hwmp-reactive-regression-test-2-1.pcap    | Bin 20306 -> 20306 bytes
 .../hwmp-reactive-regression-test-3-1.pcap    | Bin 22690 -> 22690 bytes
 .../hwmp-reactive-regression-test-4-1.pcap    | Bin 22525 -> 22525 bytes
 .../hwmp-reactive-regression-test-5-1.pcap    | Bin 15175 -> 15175 bytes
 .../hwmp-simplest-regression-test-0-1.pcap    | Bin 77576 -> 77576 bytes
 .../hwmp-simplest-regression-test-1-1.pcap    | Bin 80967 -> 80967 bytes
 ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10400 -> 10400 bytes
 ...hwmp-target-flags-regression-test-1-1.pcap | Bin 14987 -> 14987 bytes
 ...hwmp-target-flags-regression-test-2-1.pcap | Bin 13350 -> 13350 bytes
 ...hwmp-target-flags-regression-test-3-1.pcap | Bin 7135 -> 7135 bytes
 .../test/dot11s/pmp-regression-test-0-1.pcap  | Bin 771 -> 771 bytes
 .../test/dot11s/pmp-regression-test-1-1.pcap  | Bin 771 -> 771 bytes
 src/wifi/model/wifi-remote-station-manager.cc |  13 +++++++++----
 21 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8d8214caa..883c2455a 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -40,6 +40,7 @@ Bugs fixed
 - Bug 2828 - OLSR simple P2P example produces wrong results
 - Bug 2827 - wifi: Active scanning not working with 802.11n/ac/ax
 - Bug 2836 - wifi: Missing VHT information in radiotap header when A-MPDU is used
+- Bug 2838 - wifi: ht-wifi-network crashes with RTS/CTS enabled and frequency set to 2.4GHz
 - Bug 2843 - spectrum, wifi: Incorrect channel width and center frequency provided for non-HT PPDUs when building SpectralDensity
 - Bug 2848 - wifi: Association ID not correctly set upon association
 
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 50dee3a8c3523eafd1ca38244dac82dbe99189cf..5559072a28ac1a7f9ff10eb058d112354935eb48 100644
GIT binary patch
delta 190
zcmaE0`M`358zax;JVxb-Ss9Ex6E6n?dFqT1v0Nbg4r4lybYTLqH!&3gNfqV*AX&;B
z3M5a1*)l93b`c9m{4kg;$vU5rXY)?h-Hbr0l>H7XP$q~MsA}^H-VaPb&P)Li=e+=!
x^FSEHF%toE)Wt!ZTJbL|ATwn`C3%D-R17>4aw=FEvRz*=7O~`}7H2R30RYgdGxY!f

delta 190
zcmaE0`M`358)MJpJVxb-Ss9Ey6E6n?dFqT1v0Nbg4r4lybYTLqH!&3gNfqV*AX&;B
z3M5a1*)l93b`c9m{4kg;$vU60XY)?h-Hbr0l>H7XP$q~MsA}^H-VaPb&P)Li=e+=!
x^FSEHF%toE)Wt!ZTJbL|ATwn`C3}P<R17>4aw=FEvRz*=7O~`}7H2R30RSHaK=l9s

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 14cd646f45c2d2dcf557a98f4ced74f2d4203288..24d4adc6e52f9562e0489f9969ed2b1e5afcb3bd 100644
GIT binary patch
delta 295
zcmcZ^eKUH(Y(}2R2bh&7?#}=+44H%{TQfQUSv8Dq5Q)jp7`?zU>0rLd<h4wZU_MAC
z&tx^`ARt-E3{jm6mXV+A%i;lK9bg8j=AXQi1!4k3hcYWjM;U7XkUY*B3M6IOKx8o+
zNaP5ZEyWHJDPRYQ90aq)IY1)096*uH`#8iIfz&llQ6?buhC6^0C}k@OQZN}rZhk4c
zfd$B!B?S`t03tWLNrQ#H%Y%e`6+l9Z6~ICvsvx0NAaawM2s@B1stXdy29pPMB>>n%
BO{D+;

delta 295
zcmcZ^eKUH(Y{s6+2bh&7?#}=+44H%{TQfQUSv8Dq5Q)jp7`?zU>0rLd<h4wZU_MAC
z&tx^`ARw=j8KOEDEF(YJm&F6Fnt$?67KjND9m=dA9c8QmK=L?iD3Fw81ChmSAdw?r
zwiG)^q<|eHauCcG=KzW1asWj(@8b|>1X9;HMVWxq8}0y3pp>mBNWo+fx%s8&1{NS^
ymJ~?n1Bl%0CJh$)E)Np&RR9SsRsaiysDgx6fyhm2BJ4o6s4hq(8%!S5l>h)(=wYP*

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 7c17640813bb5bdf44207e6536c7a1204748b17f..21b1ec529c7bb90f107b7ead3fc742c8eb2d68c3 100644
GIT binary patch
delta 304
zcmey9{wICHQbwMM%i<Y%CQoD$nS7p^f3hZ{7m!!N=!qou5G<y{lnxhToxGMQ1jzf(
zB0pJ?IS8bK*$plm31n%qKvd^~RTTosLe?~}xcubrtXe?UL>A@Au52K^GuT3b<U26w
z!VY530+S!Wq#FlFWDc181SUN=K_c@&<mNA&;*3CwhufbCNX765a{;9`h=ZiqB&M>0
zbjpHMe*%%4J><Yb_mn|GCMqDIE)}qlf)+@q3`A}|qm{-1<QN-+ggU|GePdYww_a1P

delta 304
zcmey9{wICHQpTQ%%i<Y(CQoD$nS7p^f3hZ{7m!!N=!qou5G<y{lnxhToxGMQ1jzf(
zB0pJ?IS8bK*$plm31n%qKvd^~RTTosLe?~}xcubrtXe?UL>A@Au52K^GuT3b<U26w
z!VY530+S!Wq#FlFWDc181SUN=K_c@&<mNA&;*3CwhufbCNX765a{;9`h=ZiqB&M>0
zbjpHMe*%%4J><Yb_mn|GCMqDIE)}qlf)+@q3`A}|qm{-1<QN-+ggU|GePdYwFA`|4

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 b0a53336d1d92db86bd54bc9dfd1e4ef3791cac8..1ad4dba49b74c4a7d213d6ce35874c68744188dc 100644
GIT binary patch
delta 272
zcmcZ-eI<IrQbwMM%N!YbCTlS%Pv&OyfU?RNy@0GkjOk#0E|8qTlnEr6m_Z_0%pj2)
z%!NR5HjB*UG!_#uD-B38v3deYAJ$T++&xy1oG@D`kjw;=``H43YyozVNE(>j!wwSR
z<p7B!gUOv7AQ3K3pvdL~&Yes^N{WYv5lE@?&g1}62Su-g1ZPU<0jbF+q(BPgq`_j}
pWWi#p3Lvp+1+ZAKGFYrh6(n{;HIfxb8EJ#X5_N%Mleg>20ssP>L}ma0

delta 272
zcmcZ-eI<IrQpTQ%%N!YdCTlS%Pv&OyfU?RNy@0GkjOk#0E|8qTlnEr6m_Z_0%pj2)
z%!NR5HjB*UG!_#uD-B38v3deYAJ$T++&xy1oG@D`kjw;=``H43YyozVNE(>j!wwSR
z<p7B!gUOv7AQ3K3pvdL~&Yes^N{WYv5lE@?&g1}62Su-g1ZPU<0jbF+q(BPgq`_j}
pWWi#p3Lvp+1+ZAKGFYrh6(n{;HIfxb8EJ#X5_N%Mleg>20swEaSY`kK

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 b1c6b768694348f3acb33dcba1cb58934765428b..d018de8d79ecb06fb62ecc79c2a2d394ffc1095f 100644
GIT binary patch
delta 178
zcmeCN?6I5>z{oQ((2<d6ayz5)#BCWshCE|Bn41eEzcOY5$#^DDAi0vM6i5~@%S^Ur
zHUYDMdM6)b4h53pEFg9U3y8fB%;skWu~S)r;+wazaxnp^gX}zvK<XUFaW)_|jo%N%
jdn)i9MBNnv^K?YOJQXo8uULEyGf+-J8pNBNFCz;8Z0;@9

delta 178
zcmeCN?6I5>z}Pb}(2=ocayz5)#BCWshCE|Bn41eEzcOY5$#^DDAi0vM6i5~@%S^Ur
zHUYDMdM6)b4h53pEFg9U3y8fB%;skWu~S)r;+wazaxnp^gX}zvK<XUFaW)_|jo%N%
jdn)i9MBNnv^K?YOJQXo8uULEyGf+-J8pNBNFCz;8_9{Bn

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 e9004f4b9caf54c0288e5c13c37715af15f029a4..8e1ca74fe3fbe16cb31103ca3aaff93ce37e6f86 100644
GIT binary patch
delta 882
zcmX|-O-LJ26or`>V`8Ev+KHL?M;H{UqK+meq8rf)DuTaTp%k<#C=s;iUT{-1zAn^K
z5jWYm(SYr;xUp{B2qH*?xbU~uLN_8^c+bpxZ*%$1z4zRAW|Hw_e6>sQFhkK3lhqu4
za9|F_qCRWDcDUBrUnNYvN*njG6`Sy+CDmk!-h!kfNvd5;KiF|=-EQ5|*t30@bYJ#3
zfAu_DY*sly0}her(A1Qjd2__hsHEMTLw;e+*+Z0e;$p_7vyU!pgAO?1BJ^Ocm~2b>
zBdN`eq;dBY)wFwvs^LLuIKO&?^G;GUPxO`~ok|Mji|I`M5?x6Y=qylx9%zgcl0n<N
zV$v^ZOVV#Il7)Oo_SuJI86T3t*;^=_8<K7$MT+otyQ;IxBJ6=`-w0Zi^h=UowWdgh
z?R^z*->7(d$lq;sQ$PJqh48r8`axRiZJ-d1Hm#THvRMs9V~-l#8JEUdgM&m?FPH5F
zdr18cPEZ{yiBml<8Bsi`y3+SJvsy-iU6;L3&6Hyht@!RH@l*}*uI3_(M5rF(Q~ew)
zj}5SN82wbg7~p%8TN}ZNM)a>tjx|jaC!0>F&WHI2u(R+i>Fx;r?zad$|03{oHiI{t
V!4D?4N5N}R^lwdWiGf#Qfmg$8>~#PD

delta 882
zcmX|-OGq106o#1?V`8i((MdD$QNqxI57g1bM3RkI3q}N=+kzCd4^Seg=w5K4XuMtY
zK}FnT<3<DOvbd>kx)DT>2ys!{`UE#cy72rn_ukFn`_DQ5x&KTil}W9<QWlw^=;`-$
z9QHUchhkB$HDDWD>+DVmQ}4Nrd)cy0cyf~J3q)^L(ho_hT}<EDaqE-ax}~vy_94=}
zg=75HlR~li!U5`ch&=nIrtHj9Bz9g)+AP}V7gn7~qMQ>K^DdpebzvK{!wDCm2a3gH
zUDA!Dgd0gy?hjOR?m?<X2~xxPwM01oNQyoYy?IGTl0v0oI#D`LSJGuV3zVS;8s&s!
z&^C{l^hsKibmc*^kQd38yhxV!A{m@LKH>Z<=|WPZ9B+51Iy)=J9;l&0(43?LNq*Iu
zA{n-~RlI$n;_X3yx7E#l_d6BB!>85{(z3My9~ud*hw6e^4Mk(u8r*r8#^S*NBCA)-
zwt`7g|AX(Sj#j3qo>UGii`mAi5u916Cc%DHKTyrrU=V$_>n3qq2hml3T0kPy1ToVz
z1<Q3aES*Ll)sF`FugUQiaJmKkbCYAO<HVWPpH!#A`~%o=c#?E?1b_Ei1fKf{JTKe8
XU)sQzCU-=^t5NiSo7^4)FUJCp00bh0

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 1ef035455cc1c24e919f9cb924284037ccff4480..ebc9ace8b045519f980e1e562811382cfbe11283 100644
GIT binary patch
delta 1228
zcmY*YO-vI(6n0yvxLvW`g0L2lb}fn_MiWhlH5f=~N^477B_1Ro8dO9h1rK^K9Ee1S
z2kV&V!4N&j2~BW`2PGlmZ%jP-gV7U-iH4{NdJ_-6Z+2%>dU*Z5Z{GXn&Fq`yNojdf
zx|Wude5RSgqMm=W9sfyASXSapXLkhnCBQz1wKVS7Eh%iyK_<-OjG|Cu1I|N4UpP;i
zKItMWc|w360_-iemaYi!5x|gKU6SyU*~r?<rc*;noQ%DSkBygfk(8;pzK+t_w5+p~
zjc(g$$wrN`$Q!i~9g^35Z4I)BTP1eboiO*Db)$c;lA}1H(4lzZPeoXS*9$aeqXip<
zO2z7sjh>dqxV52gXve`aJ~ryvLB<)c&OUii095BS5qblkx46zcs>tcG(Ugk2UsSEG
zqdv21AA7(NH!S02WwxQo$=XwH8`@~fMt{q#emggce&;IC@3gG3{hG|Yl_(didlkFC
zimend^ebv^Y7NAmYi$MEu1(~M3F`LCY`BoTEhK)woz_X!vwpe(?i;8QS1`tr*h{L8
zBO_IA^i->K|LlB?`BgRczQ$_G2yW&}dult(4>VERNSO<@FwX^a77gIYxj?_!;(*h|
z{smGbC4zkvF_o`_G?lC=RLvqfiZAKpWxUf*W6!1#5q5*erO;i%XzyN~*#A%6Eu>xD
zc7h_@T=j74t%t{x`e84Ta2OtWMB`gnb`kmA3@O$EX`*GTgUHJWq^efL!B#xYXB=x$
zB%O<{V4waN7G`5eQrm!!^ElH6MUInV9ErP-dMsg%nDHvXujumuTEq-DCB;mPCUNs$
zlKjbQtTP2Vox%&!+hKUI9b3HN(VvErOGBCG(U*bJmx1z_M|T!VPZr8U9-Rj}G)1l4
ZvNLw{%!Oj<L;kxoSah~`=+qke{RbD)S?mA+

delta 1228
zcmY*YOH30{6m?ptIIY-DK^O~2I~K(dqlqTO8Vm%Q(%K(NT-X%RpduP6xX^`RK_o)D
zus#!A7@`YVp$U$0p(I57#>AB$jIKybG(=6%ow)FxH}fW?i`#R~yZ5~N-rTo5B`r@$
zS5s2HkZz^0s1+V<$A6p?)+KSKvD*Ut5@4UrT$-@$mhx=QMkdT{52H|JgZ4v2U)WC?
zKB*Ejc~XEM0_-g{m#zr#5kQw5SxI=wY;^5q!>Oq(O2!_SmrayqNlI5;TSw_^M%Gxu
zLboimWT9qR<c*n#4$14jb_7_vQz3TP88h~rb)tWdD@SqEMTg>vKV8Biv|gZb3oTeE
zST0tFE%dZJ!mV{}LlOr|d)b(K2N|b58vEo%0Z@a-K<Ev8-sBo{D<UUrp=kwozo?j9
zhrLGEUUr`&Zdk#~Dl9{TleN3jGPKaNh5lBW{bn|be&?#t?~JUn{i@77)hHLNXBE4*
zimene^ebv^s7=J4tDQyKu1(~M3F`65Y^0dHEhavnm6oCESs&d1_x0C^D;VcU>?PGk
zk&&p>dutWCe|Emk_^K*<UuQO@2R8GiJ@wtj2b!#Jrp$$UnCJW&3;S{8oPWS*anSBy
z|NIG(Vu5~&n9A1yno8CZtYz&QiZ5y8rN7foW6zc#5q6!&rQjXHXzy-=*#A$%O{C?w
zouCLeM<d+&8sYJzal}I;6oN+qQU4Z_9YlV&LW;COnrz!@Bl5BxQcVZqPzRpoGmh0T
zlFo%!u+KmQ3$qa<DV@N_d3@LjMUIl9ABj4UdMsv)nEoopujumuTEq;u#KlaE#c}gr
z;{3_0ERz78N#F%(Nf=&CVv9FC`chDGDJb(idecz)(@-As=<I^h+XdwTkM@JzYF??{
ZvNLk@%!N|vL*ctLRC2a&_|zKu{Rau|p=<yE

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 7e8958add2f613e2a51f32b3ad2d805a8cda5e7a..468991eac1a98881489b7d802bc08a8d44b98056 100644
GIT binary patch
delta 977
zcmY*XO=uHQ5cZ{;gzQGvX17VUiEU^iF+GSup@|r2{7cgOkPtn1Q)snn)&7VTf_E`c
zZ3l#+B-BC=9xAv86+L(nJ@nEDA_yKtv<On6peMnZ-F=JQ!|;9I%=>2Mz3sGEr^W7_
zWL`+J==`NY3p}>~xR{B`W&$2rJPN<qLDZH;lm$tE!ww=-4$BBWIk-Whi=$Z^y|IxZ
z@a#DoJ+Y7mlO7TN3VEybMJKO)W+SJIYjqnf*=W;78TUBz>MQP1hGvqdXjp3cq-QS)
zi((z4u}TU-TC(!cl1?GtlGZT3_VQDEcD|!iSPxZ20H;j5ACmc@w!xE3gSITfA9)0`
zM|Y8h+|4bncmHRx4^v5|0w`w?)r!i3N^QyEsybyO5xRQJZAllQwvDy7v7bHEHRY$%
zkNsv>6~q8F7!8p6Az;3h3dta;%^+1ZgZ=P3xQvJfTGi4vl0oXdi|j!!cU#pYaD^sN
zn+ehVy$$h9JUolM9VT@vd>U`Qu=^Ta*^53Ra=%0*6yf!a2=CK~$oj{~Q%W}n_<-LA
zXu#p<1&lP-t0-}QjMlgvBgfCNj1Nh8XvHcK0}^~00%SK*SO9CO^B51L3s$}nk@Sb@
zX*W_iO9f*T^_SVp4kYp8B;7LNdy3166QmF3su&wN%B~xDJr{-}`5(v=1#=rspDXyx
z-y@4M%}c{LiWOwFqPc?xogzJPyhJ-JmdJ3kMCQX~!uQLBzZ*DHAv{+h{cEM#=k*0+
c`}1cfZi=q@oekzbHow89g)3t-<2&&C2iiCJQUCw|

delta 977
zcmY*XO=uHQ5cZ|{A-l@jY?@@7*e*>ZrUx-7G!Y|>e@U7j5>gM|6k4rXwLfBo;9X3p
zwgW;@5^A9b4;9>liXOZaJ@nEDA_yLeXc44BK~I7+yZaWqhvECanfJ}id)scZc9T6g
z!x|80;khgQCU|KAa54iGjRZU~c^H1NBd9G7$@8Kej@gJz+Ds$(Y~u#84vuClv}z&Q
z&a)RR^vpyGOt=O3YtNdkFFSbc3kx}%T&r4W(L!4mO1Z{ZLtA!@Ff<e0dEHXcCfo-|
zSP-fh^;HrGlA@W1rZ|jzTU^8Vb~it@f6se5h4oOD?ck7T_oEU&)Y5sJDbSJx_#+Kr
z_QYPYkUF`=&CdTU4q__Kya4h!M3uZe@1?fnaNRp;ApttNjBQC5pt6ItcCepa)HUIw
z(@%XyS1$;DYB1s_^`qZ-D=)+Yq}BseRS)#S@4ylw8fZmHT1W!1`#!Qq-P~<O5y2T8
zM{PPt_xCQyGttlt@>Yn{?a*1g`P{x6bY-u4h)BI6k)X=!Ybx(kQzh+_`kd1BK0e^L
zJ{oW^d<i3s^(IW*7oj!oM#%9?B;`R88dx?<1iuIy1Ay#S0t;X*aS`L;WX{ajR8f1J
zoN^(R(o`@?QG1=fYC{q|MbaHTexSG%J573jri`(cq3pVj*E1nFp8bJ5mNT|dwAq};
z_&w4n)4Vi{Enh-b$s0Q;(9Y8nM+>yWLV*mo3S>T5B>b>Q_`8l%CBm~M(!Z9<Jq=GF
dawvO#{I=k%-rHoZlXIJF%6@HhdTbYd{{U>UFyR0I

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 5f64a740614d64814de29559128c146382d14647..8b392a9492c263f4d60561617b6a24ec4e83ea38 100644
GIT binary patch
delta 1348
zcmY+CQD{<O6vw&RG_Ou{u1#IG?5bB3okD}gYEUz`S~In>h^R%7Jrt|OUN>k&u%aa&
zL2C~yA0iqNa#@dSw1*f45=5i*WG{P~Bs~;F&^h{j*ZaMk`~RKqJOA??J;jnxED4X&
zf~Al-451<w-iGiyS_hI9>Lih8OjMaTsG~=-y8T$*Nxou+2zsc6D3J+$gC(-6D(eoG
zyP&F9s``Tp9zl{Vc<ojTeZ~(&%*PB=Ofm6^3Ad3RT{8|tZOKS$_wA(ln@p@QVKLF8
z^Gv)n9f#UqraT>CN<>~4k>h3@EN+%a(F}EU^;1;?7M6RUs!gVpV5=-ZN!mIB5q=xx
zo%ISPB->Spv$kUp<7O9`YZJ+DTek6gUbZ(Z8|gP3{o`n)t$7pv4Ap8&lNU*^qj^gt
zGf0Jsi+pfEKegmgyY|w3mCEf}V|kbM)+9%39N9bO!2Nj#3=Yi{L+1^cyO42^d(J3r
zTXr(*vQs3oi&-O0a<s;g-L1WOiKEv@I9<)nrbD}Ym$qb?BmHjeS%#xUj<z}K_uzyd
zJ#@m@9yVdAn@u?F6^VW?vq#Esw8+smNB!Pr-D$z1eDQkl7lhHw5-=H)a5*c9Zn7oi
zKn?hCrE0z|vg(V~)hUQa{bwL9_>&NE(f<0eHXUdzwu_XV2C@-IL9XU=kUse$s3$Vk
zRO>Mj1g$&`j^ox=We<@<2Ou#PGGpR;821`{mCxZkCi)_*(R>6ORU@p?coZ3%Y(&AK
zuB0Alr`+jTcfjYw;4nHoPJpFSNrVwvlgw_~Yaq9i_|Er9W;r-SEtRFAZw5HJo5F{G
yPrZPM!!Deh2e01rs180e*(H5r1CQk30l10}nb>3^aF!lTFtNgfc#a<BsQ3>r+;f)z

delta 1348
zcmY+CQD{<O6vw&RG_RZJT${RV*;TJ7I)w&})u3i>wPtE%5mAdEdni_my>8HmU`b0p
zg4P~ZK14Jk<Wi4ow1*f45=5i*WG{P~Bs~;F&^h{j*ZaMk`~RKqJOA??J;jnxEC~-&
zLcWkb451<w-UjhIRtJ(1>Lih;OjMaTsG~=7y8T$*MZRK&2zsc6D3M8hgC(-6D$5R*
zyP&F<s``Tp9zhZ<c<ojTeZ~(&%tsAWOf&I`373%`T{DhAZOKS$_wA(ln@p@Q(Q2Yc
z=b3n6Iu5nJOgTEjw1~VeBFD@)Sj;Suq8aMy>Zhs(TUjozs!gVpK$|Q;Ny;(`5q=xx
zo#hH9B<od(bJk-JV`e9rZx_jLYo_sgUbZzX8|l{^{o`n~y?GP<4Ap8&lNU*!y?IL{
zvq*)ClYFp4KegmghxXEamC7AjV|kbM))Yr;9N9YO!Tnh$3=Yi{L)Q(MyO6e%dyWWg
zTXrz(vO^@YlUXB8akR#f&85A0iKACYI9<)frbD}2x3=UBNBZ5`vouFb9Bp$n;Km6*
zy6J?`J#4~K51VktBNF{yW{;HSXo;h3js`r<y3;~l`QmZoF9@TVC15fx;c`~uJ!DJD
zf*SPVO4YpGWYrt3t5Xn<`p!UH^d%tTqW$$@ZOY$RY$qu@3}nNfgj~&QC;jq8P>*G-
zsn%mW09ttxn82;A%5EYD4?to(XvW0#5bibjDxX6+O!S9YqlGXws)kvki3l<_*@%Ec
zT}i#rPPx;&Ziml_p%HX=6bDPC5)UD?C79ie$3Si;@SX1y%yMX$S}M!K-wbecH;E7b
yo_r1whh03m0A78mF&%tnGt2tM1|G@618@}|FtN#m|13S4WMYL0@f<zMQt=<0=(!gF

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 1f0afdb787fd79c56815d0ac9934ded654f21aa4..9282eed86b11dd3f4b472cccdc6739b8ef977e93 100644
GIT binary patch
delta 1022
zcmY+DO=uHA7>3<6KbmaXn3&jY)8=PXL@8J?rie7H2^uW6X_K~65iKH$STOBHg$iEk
z#Y2}-qz6Tc*h9e>7K$fD@#i9nUi6?;E2v1((2F2O{N7z>Y;$<`dFT6?Z+0iul2R=x
zlQ~7zdpk)!GJS3fo(D|B`xMhLepA4A0lRHG6qOfkdy%Q}SGEG#O*JPhJ5vMu+p>&b
zvhOGR+D=j4s%rd)!_5ynsJC>p%N!butbNYqSyxxMPb*xj>yDxtA6yR=DxY3s&c(Ru
z#?FIoYiGt6OyA-W{+`F`&$v^yh>lLXGd}&#GhUI@?!|0lUTSXUy!VRgt+j&ANqQzJ
zSSO;#B$exm)P?z8kS_VUNXr4nhu0z#RFYJc)a4h^DM?@am?<2<OsJa(SUETce0-g#
zIV0)5BsD0aLqW{*JouPY520EQF>YIrI4CFShNMMFyXwDD-bU>y>7te=?P#ED#dT8`
z8mu>_@lwjkvyI&pxz>npP!2?Ra~OUkjQ!`s{iKN|)J`;k-$9M-&8P5PuSf2Zc1IDo
z6@5U8i!vS?C91^m5-YI?KNQC+nT#XrbDUZkNw&vN=6nJvRAS60{OGr|6NBlY2tSy_
z5Hm?}MK`w<sBXONiGv>Lb`P?9QvZ*E9k6#P<u+U$t0`>wIxEOh(v*e&#BiEg@VT^T
znasdn&d@oHKbf~~GH-e?V@nRly<qA~Q=`3DDVqAo)Ii@aTB*%r{YV}>Q~=Kwz_<Is
oKTXXJfTsqqeq}JHss8#6+p<SbpLN(S>R**n`^fRJldI_W7jOR{D*ylh

delta 1022
zcmY+DUr19?9LKwJe`<epZEbmVx<98P3L&F4iE!FRjU=6JY8X)xQA9%1mkJDev6nq~
zIYszTghW0Ft#LtmDvbWTL{TsGP*?^PAvJsnqD8;&y`7Wp;d?*d^ZRpt=iakwNvW2U
z$*fY;dOJxzGHq@fo`(#>`xL`5eoMf20edaGlp-%!_9Ii}uPk}8TWU_3cBTgQw`m!_
zVm(OqwUwg0)vfX$HYY!7qu$cZu5f59vJTi+W?ft5KCN=Cj=M@x|KONcsC;^zF&E=*
zCw3lmnmaSTX!sVF@b_J2f5z=@lj!KQJLA*;JmVEf?H<fF=Aq_B&U=rj-d-!{f~04X
z0(ByKLQ=V|KwX&k1?jT4i?r-#e0V)FK_y95NnJh>os#s$hnYft%!IlLznOz`z{fU-
znsbsKNOA{6bSQv%o(CS2YC%+MLB=f`5eH=@-ITN>X;1w(%G<0yC0$Z;q#X@(t+;0B
zVuSg{R9;Hjd8V<OBG()74a)v7Zw|qags}fYsGl_6gxZNF@H?o!v-u3Z>y7X|((VWX
zw<8ZpaZ$#jqePV`UScI0=0{?9C6h5^eU4EpJ;C<*$Xtvgg-Y~=xDWl7cVjRu80Lo)
z7-A+NuISdbJk^c2J+aXv)$T%ePxAjUumkokC7rsXV=aYsZ)XKrN{X`ZpBPS23qF?;
zEfZ<@Vw%pW|4F}fl6ljE8C$YA?j=KC8XD=vO2N=ahWh({(MoL&>&J57p*(mt55Ch6
p{%L4t06aB-^{azfwdkwgv?Fu;?0K8zvi4OOwT_$|JH3W}e*u=-U8?{9

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 6b69cb423c45b87c3cf18e4ee94658a3e8115c69..cae47aabf94e42117ae222c09ad1589d3338328a 100644
GIT binary patch
delta 499
zcmX?JcD!st03*-DKt~|)P<i4uEfDPs=1dM^1oM<9FMu#qCckIYgh<&iL8ZEwOc;44
z?`Lv@h-)%?0l6j2=@9OJW~ee>7ARvjjPVl2FlU8IwZa&eS#=nBCb4;f%#hri%$Cat
zH1i@m*b2$Xh8!V4ZW{;K3X#c7oRL6o3}+#bJjV(2%Vc@3P#{^#wHin&a!&%1Te#N&
z$z+~1AbE-hY_7;;4c<f`w~H5~<u)%+%VtA99*|9T{2={P_(2j+LF~=e0tUQ5PLAw3
zAZaZJc8JL2X>#R2IX?N1%#1vnl(|7#c~l^Bi_=w@fZPl<sGCoyf!r*s4t4WPb&#7s
zs{`G<IaMQ#3&=TR1hQ1g7-VTNm^@;<6v)mp0g3DelRTy%cC6_yAQ@o>Vy`p<v6q;G
e*k8>-><<<owxcD8oCGExTY|*zS%F0Ktt9}XfR%dy

delta 499
zcmX?JcD!st0AtU@Kt~|)P<i4uEfDPs=1dM^1oM<9FMu#qCckIYgh<&iL8ZEwOc;A6
z?`Lv@h-)%?0l6j2=@9OJW~ee>7ARvjjPVl2FlU8IwZa&eS#=nDCb4;f%#hri%$Cat
zH1i@m*b2$Xh8!V4ZW{;K3X#c7oRL6o3}+#bJjV(2%Vc@3P#{^#wHin&a!&%1Te#N&
z$z+~1AbE-hY_7;;4c<f`w~H5~<u)%+%VtA99*|9T{2={P_(2j+LF~=e0tUQ5PLAw3
zAZaZJc8JL2X>#R2IX?N1%#1yol(|7#c~l^Bi_=w@fZPl<sGCoyf!r*s4t4WPb&#7s
zs{`G<IaMQ#3&=TR1hQ1g7-VTNm^@;<6v)mp0g3DelRTy%cC6_yAQ@o>Vy`p<v6q;G
e*k8>-><<<owxcD8oCGExTY|*zS%F0Ktt9|g@3{K_

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 5a17dac62ddc55747262c9d43e98840db82d2264..c7ffa5b10a413b3f6a84cd49da4ef723bd8e4f7c 100644
GIT binary patch
delta 6657
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
C_fcd3

delta 4895
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

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 00700cb0c47860b926d08ff714a4d222cfdb6081..7c5e35d886d6e7c980a591264ec5541a54a59eaf 100644
GIT binary patch
literal 80967
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
J<HkZA{C@+Lrs@Cy

delta 6353
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

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 cb6464b89e83c532d8301f380203bae65906c2f4..64a7caeb175fd8056324949f0ef21379f081c3b8 100644
GIT binary patch
delta 190
zcmZ1wxFB$X8zax;JVxb-Ss9Ex6E6n?dFqT1v0Nbg4r4lybYTLqH!&3gNfqV*AX&;B
z3M5a1*)l93b`c9m{4j{US&~(d9mvt<0dX36M7V*RY2qNx8}ScJK+at$5XV@00}GJz
uL>|PkQUJ?nD}(hYgJp~~LM3^GBvcGM5^^e78M0kpFcz`orWR)~0098hu`xmb

delta 190
zcmZ1wxFB$X8)MJpJVxb-Ss9Ey6E6n?dFqT1v0Nbg4r4lybYTLqH!&3gNfqV*AX&;B
z3M5a1*)l93b`c9m{4j{US&~(d9mvt<0dX36M7V*RY2qNx8}ScJK+at$5XV@00}GJz
uL>|PkQUJ?nD}(hYgJp~~LM3~IBvcGM5^^e78M0kpFcz`orWR)~0096Zi#|dC

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 f5cb76b5d12917dde03eaef50d9ea84992c91023..3cb4482c3a0bb5fa8bee613bab4ba464db7c3ebe 100644
GIT binary patch
delta 305
zcmeA!?Jk|*#>g|-kws*3Jv0BrtPCJ$J&WkX7j{5~IwO+Y<cW-4K(RZF>0tHBlhc_%
z{PisIlP@v_0a+@{2-T5bmGYB+FnfSi=Ymxh0!c;I03cb!8VV#&fJr$vkVrloNaQG(
zlx7Es<gkN84uQzc5*!trK+Z%#kkE4wx!G1IQ~=1CtOOEz2_iS!D_>v+as<>tLTMm!
z^B(mAHXuh=4<ytKA~)aE1FKqP1msLI28o0jgB2aO1SyiW3YFv$l29@5NXV&RWyp4Y
O!C1tSn_8T~00aQ?_)u8@

delta 305
zcmeA!?Jk|*#@I92kws*3Jv0BrtPCJ$J&WkX7j{5~IwO+Y<cW-4K(RZF>0tHBlhc_%
z{PisIlP@v_0a+@{2-T5bmGYB+FnfSi=Ymxh0!c;I03cb!8VV#&fJr$vkVrloNaQG(
zlx7Es<gkN84uQzc5*!trK+Z%#kkE4wx!G1IQ~=1CtOOEz2_iS!D_>v+as<>tLTMm!
z^B(mAHXuh=4<ytKA~)aE1FKqP1msLI28o0jgB2aO1SyiW3YF{;l29@5NXV&RWyp4Y
O!C1tSn_8T~00aQ2tYldL

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 d5ef2eb071d8c0fac369fe4c0444274d1037d412..21761582e688095a25deae4af9c8a9e0ed3d02a2 100644
GIT binary patch
delta 279
zcmZ3Mu`FXk03*-DKu1QN$rG5ACvNisG8h@tA>7G5j3EAX#zG+J$>atW%>|PGm>?=d
zCUdj$Pwr#}sk*`pQkBapGdYO`#Q(=6Klu!c7LYZ838XF&EDN-4@;=s3ASuEIBD2^)
zBD=wCL3WTxIy*>Y2Z+6ykK+p~kYeWJVgics34p{>1U&hHoOSXbW&h<tLZJ#@LGs?p
zAfY+RAfZpnQ-L}scW8oyZfb&r^tHgMRCPf@Wx61tGrC|^NyZ?d&Bj2X$($y#02Uxh
AKmY&$

delta 279
zcmZ3Mu`FXk0AtU@Ku5-&$rG5ACvNisG8h@tA>7G5j3EAX#zG+J$>atW%>|PGm>?=d
zCUdj$Pwr#}sk*`pQkBapGdYO`#Q(=6Klu!c7LYZ838XF&EDN-4@;=s3ASuEIBD2^)
zBD=wCL3WTxIy*>Y2Z+6ykK+p~kYeWJVgics34p{>1U&hHoOSXbW&h<tLZJ#@LGs?p
zAfY+RAfZpnQ-L}scW8oyZfb&r^tHgMRCPf@Wx61tGrC|^NyZ?d&Bj2X$($y#0C_fE
AKmY&$

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 1a21894d8b8ef793f432ed48729a9ae0b3036c21..7d7b280450d60fbad8682228ebce2e7828bb2c38 100644
GIT binary patch
delta 196
zcmca_e&2jT03*-DKu1QN$(fAG6SsK*8H|kSU~Vpuyv|q%Bt4nZfaC@yPaye=sT4>S
zFaz~XKFAyjB*j@k><ktVdmo6snV)qY6OdZRuEhwXZgTwQ07_jI1WBn0nF7To#|VQs
zYlXi8)lFV32I71X1IuVhfH>6>V3|Vc0688Z2^9m6gq#X4hI1}27#UC5zF;h3$xSWJ
HU;qLDu=zC`

delta 196
zcmca_e&2jT0AtU@Ku5-&$(fAG6SsK*8H|kSU~Vpuyv|q%Bt4nZfaC@yPaye=sT4>S
zFaz~XKFAyjB*j@k><ktVdmo6snV)qY6OdZRuEhwXZgTwQ07_jI1WBn0nF7To#|VQs
zYlXi8)lFV32I71X1IuVhfH>6>V3|Vc0J$C^2^9m6gq#X4hI1}27#UC5zF;h3$xSWJ
HU;qLDNmD`_

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 6d4616af6e5bb09e2d0f57f9c13468ffda65021c..967b460cf8194cf306d1ca72e31d5b5195ba651c 100644
GIT binary patch
delta 76
zcmZo>Yi64ez{oQ((2<d6awenl#BE+c1|wrSn41eEuQL_`NlzxAs>!pM0wj5aBvcGM
W5^^e78L~KDFcz`orWR)~0098;7!tz(

delta 76
zcmZo>Yi64ez}Pb}(2=ocawenl#BE+c1|wrSn41eEuQL_`NlzxAs>!pM0wjBcBvcGM
W5^^e78L~KDFcz`orWR)~00982rxwEi

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 9e0339da19edcfa859a12b0e01717070521d016a..9ed7ae2d75b96de38c7859c1321a9be478414fca 100644
GIT binary patch
delta 76
zcmZo>Yi64ez{oQ((2<d6awenl#BE+c1|wrSn41eEuQL_`NlzxAs>!pM0wj5aBvcGM
W5^^e78L~KDFcz`orWR)~0098;7!tz(

delta 76
zcmZo>Yi64ez}Pb}(2=ocawenl#BE+c1|wrSn41eEuQL_`NlzxAs>!pM0wjBcBvcGM
W5^^e78L~KDFcz`orWR)~00982rxwEi

diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc
index 13d6b2db6..35ed6d7a5 100644
--- a/src/wifi/model/wifi-remote-station-manager.cc
+++ b/src/wifi/model/wifi-remote-station-manager.cc
@@ -441,6 +441,7 @@ WifiRemoteStationManager::SetupPhy (const Ptr<WifiPhy> phy)
   //acknowledgements.
   m_wifiPhy = phy;
   m_defaultTxMode = phy->GetMode (0);
+  NS_ASSERT (m_defaultTxMode.IsMandatory ());
   if (HasHtSupported () || HasVhtSupported () || HasHeSupported ())
     {
       m_defaultTxMcs = phy->GetMcs (0);
@@ -1824,10 +1825,7 @@ WifiRemoteStationManager::Reset (void)
     }
   m_stations.clear ();
   m_bssBasicRateSet.clear ();
-  m_bssBasicRateSet.push_back (m_defaultTxMode);
   m_bssBasicMcsSet.clear ();
-  m_bssBasicMcsSet.push_back (m_defaultTxMcs);
-  NS_ASSERT (m_defaultTxMode.IsMandatory ());
 }
 
 void
@@ -1933,7 +1931,14 @@ WifiRemoteStationManager::GetNonUnicastMode (void) const
 {
   if (m_nonUnicastMode == WifiMode ())
     {
-      return GetBasicMode (0);
+      if (GetNBasicModes () > 0)
+        {
+          return GetBasicMode (0);
+        }
+      else
+        {
+          return GetDefaultMode ();
+        }
     }
   else
     {