From 822d5a10e4e5354bbec28dfb9d4d7331b900128c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Mon, 26 Nov 2018 20:01:12 +0100
Subject: [PATCH] wifi: Refactor detection thresholds in WifiPhy

---
 CHANGES.html                                  |   4 +
 examples/energy/energy-model-example.cc       |  10 +-
 .../energy-model-with-harvesting-example.cc   |  10 +-
 examples/wireless/wifi-clear-channel-cmu.cc   |   2 -
 examples/wireless/wifi-simple-interference.cc |   4 -
 .../wireless/wifi-spectrum-per-example.cc     |   3 -
 .../wifi-spectrum-per-interference.cc         |   3 -
 .../wifi-spectrum-saturation-example.cc       |   3 -
 examples/wireless/wifi-tcp.cc                 |   8 -
 .../test/aodv-chain-regression-test-0-0.pcap  | Bin 6530 -> 6666 bytes
 .../test/aodv-chain-regression-test-1-0.pcap  | Bin 8954 -> 8954 bytes
 src/aodv/test/aodv-regression.cc              |   3 +-
 .../hwmp-proactive-regression-test-0-1.pcap   | Bin 7313 -> 7313 bytes
 .../hwmp-proactive-regression-test-1-1.pcap   | Bin 11737 -> 11682 bytes
 .../hwmp-proactive-regression-test-2-1.pcap   | Bin 13278 -> 13453 bytes
 .../hwmp-proactive-regression-test-3-1.pcap   | Bin 11732 -> 11835 bytes
 .../hwmp-proactive-regression-test-4-1.pcap   | Bin 7308 -> 7466 bytes
 .../test/dot11s/hwmp-proactive-regression.cc  |   3 +-
 .../hwmp-reactive-regression-test-0-1.pcap    | Bin 14113 -> 6339 bytes
 .../hwmp-reactive-regression-test-1-1.pcap    | Bin 21037 -> 11396 bytes
 .../hwmp-reactive-regression-test-2-1.pcap    | Bin 19653 -> 7063 bytes
 .../hwmp-reactive-regression-test-3-1.pcap    | Bin 21247 -> 9169 bytes
 .../hwmp-reactive-regression-test-4-1.pcap    | Bin 18573 -> 4844 bytes
 .../hwmp-reactive-regression-test-5-1.pcap    | Bin 11692 -> 2271 bytes
 .../test/dot11s/hwmp-reactive-regression.cc   |   2 -
 .../test/dot11s/hwmp-simplest-regression.cc   |   3 +-
 ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10400 -> 10782 bytes
 ...hwmp-target-flags-regression-test-1-1.pcap | Bin 14987 -> 14902 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
 .../dot11s/hwmp-target-flags-regression.cc    |   3 +-
 .../test/flame/flame-regression-test-0-1.pcap | Bin 5260 -> 24 bytes
 .../test/flame/flame-regression-test-1-1.pcap | Bin 7062 -> 448 bytes
 .../test/flame/flame-regression-test-2-1.pcap | Bin 5542 -> 448 bytes
 src/mesh/test/flame/flame-regression.cc       |   3 +-
 .../ns3wifi/wifi-interference-test-suite.cc   |   5 -
 src/wifi/doc/source/wifi-design.rst           |  36 +-
 src/wifi/examples/wifi-manager-example.cc     |   3 -
 src/wifi/model/spectrum-wifi-phy.cc           |   8 +
 src/wifi/model/wifi-phy-state-helper.cc       |   1 +
 src/wifi/model/wifi-phy.cc                    | 189 ++++----
 src/wifi/model/wifi-phy.h                     |  34 +-
 src/wifi/model/yans-wifi-channel.cc           |   7 +
 src/wifi/test/spectrum-wifi-phy-test.cc       |   2 -
 src/wifi/test/wifi-phy-thresholds-test.cc     | 425 ++++++++++++++++++
 src/wifi/test/wifi-test.cc                    |   1 -
 src/wifi/wscript                              |   1 +
 47 files changed, 592 insertions(+), 184 deletions(-)
 create mode 100644 src/wifi/test/wifi-phy-thresholds-test.cc

diff --git a/CHANGES.html b/CHANGES.html
index 1570797ed..b99bbf114 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -70,6 +70,10 @@ us a note on ns-developers mailing list.</p>
     RandomRectanglePositionAllocator, RandomDiscPositionAllocator,
     UniformDiscPositionAllocator.
   </li>
+  <li>
+    The WifiPhy attribute "CcaMode1Threshold" has been renamed to "CcaEdThreshold", 
+    and the WifiPhy attribute "EnergyDetectionThreshold" has been replaced by a new attribute called "RxSensitivity"
+  </li>
 </ul>
 <h2>Changes to build system:</h2>
 <ul>
diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc
index f8d48326f..9e6d54db6 100644
--- a/examples/energy/energy-model-example.cc
+++ b/examples/energy/energy-model-example.cc
@@ -131,11 +131,6 @@ main (int argc, char *argv[])
   double interval = 1;          // seconds
   double startTime = 0.0;       // seconds
   double distanceToRx = 100.0;  // meters
-  /*
-   * This is a magic number used to set the transmit power, based on other
-   * configuration.
-   */
-  double offset = 81;
 
   CommandLine cmd;
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
@@ -177,15 +172,12 @@ main (int argc, char *argv[])
   /** Wifi PHY **/
   /***************************************************************************/
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
-  wifiPhy.Set ("RxGain", DoubleValue (-10));
-  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0));
-  /***************************************************************************/
 
   /** wifi channel **/
   YansWifiChannelHelper wifiChannel;
   wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
   wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");
+  
   // create wifi channel
   Ptr<YansWifiChannel> wifiChannelPtr = wifiChannel.Create ();
   wifiPhy.SetChannel (wifiChannelPtr);
diff --git a/examples/energy/energy-model-with-harvesting-example.cc b/examples/energy/energy-model-with-harvesting-example.cc
index f89eab5da..50c688fea 100644
--- a/examples/energy/energy-model-with-harvesting-example.cc
+++ b/examples/energy/energy-model-with-harvesting-example.cc
@@ -169,11 +169,6 @@ main (int argc, char *argv[])
   double interval = 1;          // seconds
   double startTime = 0.0;       // seconds
   double distanceToRx = 100.0;  // meters
-  /*
-   * This is a magic number used to set the transmit power, based on other
-   * configuration.
-   */
-  double offset = 81;
   
   // Energy Harvester variables
   double harvestingUpdateInterval = 1;  // seconds
@@ -218,15 +213,12 @@ main (int argc, char *argv[])
   /** Wifi PHY **/
   /***************************************************************************/
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
-  wifiPhy.Set ("RxGain", DoubleValue (-10));
-  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0));
-  /***************************************************************************/
 
   /** wifi channel **/
   YansWifiChannelHelper wifiChannel;
   wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
   wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");
+
   // create wifi channel
   Ptr<YansWifiChannel> wifiChannelPtr = wifiChannel.Create ();
   wifiPhy.SetChannel (wifiChannelPtr);
diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc
index a44c24bfa..94c984700 100644
--- a/examples/wireless/wifi-clear-channel-cmu.cc
+++ b/examples/wireless/wifi-clear-channel-cmu.cc
@@ -208,8 +208,6 @@ int main (int argc, char *argv[])
 
           NS_LOG_DEBUG (modes[i]);
           experiment = Experiment (modes[i]);
-          wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0) );
-          wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0) );
           wifiPhy.Set ("TxPowerStart", DoubleValue (15.0) );
           wifiPhy.Set ("TxPowerEnd", DoubleValue (15.0) );
           wifiPhy.Set ("RxGain", DoubleValue (0) );
diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc
index 65a8decca..6501d8550 100644
--- a/examples/wireless/wifi-simple-interference.cc
+++ b/examples/wireless/wifi-simple-interference.cc
@@ -178,9 +178,6 @@ int main (int argc, char *argv[])
   wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
 
   YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
-  // set it to zero; otherwise, gain will be added
-  wifiPhy.Set ("RxGain", DoubleValue (0) );
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0) );
 
   // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
   wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);
@@ -200,7 +197,6 @@ int main (int argc, char *argv[])
   NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));
   // This will disable these sending devices from detecting a signal
   // so that they do not backoff
-  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );
   wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );
   devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));
   wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );
diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc
index 0287731bb..44d900ad1 100644
--- a/examples/wireless/wifi-spectrum-per-example.cc
+++ b/examples/wireless/wifi-spectrum-per-example.cc
@@ -183,9 +183,6 @@ int main (int argc, char *argv[])
         }
       else if (wifiType == "ns3::SpectrumWifiPhy")
         {
-          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum
-          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));
-
           Ptr<MultiModelSpectrumChannel> spectrumChannel
             = CreateObject<MultiModelSpectrumChannel> ();
           Ptr<FriisPropagationLossModel> lossModel
diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc
index d9f7ff3ab..b83f95cff 100644
--- a/examples/wireless/wifi-spectrum-per-interference.cc
+++ b/examples/wireless/wifi-spectrum-per-interference.cc
@@ -212,9 +212,6 @@ int main (int argc, char *argv[])
         }
       else if (wifiType == "ns3::SpectrumWifiPhy")
         {
-          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum
-          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));
-
           spectrumChannel
             = CreateObject<MultiModelSpectrumChannel> ();
           Ptr<FriisPropagationLossModel> lossModel
diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc
index 569a95329..30c095980 100644
--- a/examples/wireless/wifi-spectrum-saturation-example.cc
+++ b/examples/wireless/wifi-spectrum-saturation-example.cc
@@ -178,9 +178,6 @@ int main (int argc, char *argv[])
         }
       else if (wifiType == "ns3::SpectrumWifiPhy")
         {
-          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum
-          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));
-
           Ptr<MultiModelSpectrumChannel> spectrumChannel
             = CreateObject<MultiModelSpectrumChannel> ();
           Ptr<FriisPropagationLossModel> lossModel
diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc
index d06783f17..5a736a39c 100644
--- a/examples/wireless/wifi-tcp.cc
+++ b/examples/wireless/wifi-tcp.cc
@@ -119,14 +119,6 @@ main (int argc, char *argv[])
   /* Setup Physical Layer */
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
-  wifiPhy.Set ("TxPowerStart", DoubleValue (10.0));
-  wifiPhy.Set ("TxPowerEnd", DoubleValue (10.0));
-  wifiPhy.Set ("TxPowerLevels", UintegerValue (1));
-  wifiPhy.Set ("TxGain", DoubleValue (0));
-  wifiPhy.Set ("RxGain", DoubleValue (0));
-  wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));
-  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));
   wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
   wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                       "DataMode", StringValue (phyRate),
diff --git a/src/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/aodv/test/aodv-chain-regression-test-0-0.pcap
index 6fc38b7cfcf3bdcc66b63e038bdf737d762586bb..0db6f08d500bd73a79f122dd234fea193117d96e 100644
GIT binary patch
delta 114
zcmZoN?lRdhkDt$zk%6It0fIR=CU4*rnQXzI#$?Mhc>%u+lM(ae3G51!?*T=EStp+p
zXk*&L4yO3I!PH@4Al1&O2<F^Y15wQT{1_&CGs{n&ChWv~4#-~5EWY`Z@B~%>C9WeU

delta 88
zcmeA&X)@k0kALzL9;wL=0xV1~87EI*SD5@xAdQKOW%4<JHl|`WFm;R*OjQYisagdv
cHAxjrmHJNpC!ECG>dP>BJ+t`cDv=4S0CzPXUjP6A

diff --git a/src/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/aodv/test/aodv-chain-regression-test-1-0.pcap
index 01ca13b9298974b30aac9c13c2cc19a47df71b6f..92766af29d64d6174561b76f8e0b9387c9235a82 100644
GIT binary patch
delta 110
zcmez6`pb1gp9CKx69Yp90|aw$Or9fA#Vp9gF!?^a_+$e~7N#nu$!A0qCf}1xW17t}
ud7oq(6AL?-3g-e-+`?drPZ3NhtAQyqzsc`pl9+z`O>W?k*qkLhffWG5h9OY^

delta 94
zcmez6`pb1gpTuMp5v9o+B+@232}n&gkYr&roSZ12IQgDr8dDJS<b9HDOuJdZ6dxy;
jIwT0Dj>?0nTPk4ct<U6lGD%FEd?z>XNNmoMoxlnJQwt(@

diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc
index eeb0b582d..b39eaa094 100644
--- a/src/aodv/test/aodv-regression.cc
+++ b/src/aodv/test/aodv-regression.cc
@@ -168,8 +168,7 @@ ChainRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
+
   // This test suite output was originally based on YansErrorRateModel
   wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
   WifiHelper wifi;
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 a5a9df0b8fd1b56515f5db32adcb7c2b41cd9840..01a3809b5f600d2bec660cd4c5b47be721b3bcad 100644
GIT binary patch
delta 270
zcmbPeIni>%EmkJmLzCaKNlu>6%0BrIt1(m6p~;49zD&x8CpWOkFrJxgz$P+zzXb2(
zeQdf+>yK`J%XWv6ao6Ni9I;HRFHH`Rlwf0GU|`_BGC5CDVRAa>0w(DzlMSRGqTZh;
zpXN}Q?9OGwwD=2<DLHu_mowAKUm$I)AZ?c>amO+}`VH4`;Ll_~DTT>%xfd|A{$roq
z$R^Dc{C~2Zw8G|Eo@{RBl6uC;@7N^3PUVs?X52X0PQs5ls)2E`ptLmeFCaaiO@8tj
z30>y*O(2!>lcgn%8P`wtmy~5<TMl&L0Vc8KK+9wpCr<X2I>>l+GQYGe<H60k(kYAp
DRrXkh

delta 271
zcmbPeIni>%EmkI}!;{~#Nlu>6%0BrIt1(mf;mL+<zDx{9CO5FjFl{{o<OxsSFTp!`
zADb?d+Of@V+3qkh)=fUe5zCZ$X>x$11RE0r1H;M7lk+4MCZ}^QV7hsEvVjytl=JiC
z(;Nzu-MMU-62AbMl9T6gIWwjI0%>CfX`3*KJC<p|Z@7lKKa>5W6eiE*Uch|#FZ<+1
zHfbio|C9Bk6*kxMWOFlH)H6<g$0h-GE0=^ZW9ei&2|s4J2FA&P($dWPfb@Je`N?M_
zbeT^yf>g>+mX<VTjGyc;Da*8N8PJ6Xn2s$2S|-EjIN4X~AY<!ferZ|8!p*wUDU1N|
C1Xniz

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 aa3fc9f200eb7b26b3b4b8159c0c7d84c3454620..752e3175fc014887768848405c99318a6eadbcd8 100644
GIT binary patch
delta 434
zcmW-cKS*0)6vf}YFZhxd5=~T$B+tB8A^#Hup+iuJS`Y*mJE~N{!NC@^O9wTHT?&FB
z90$97xM;UR7AZxHmDXZGu?{VCh(o*8#nvL2*ze`Sxtz=Wo#A|++@5^<&&8jsxO8@-
zPtWqNLoDdyd~=A|-hjr6qCEMapc)P1R!_6@2*n2h<lGMaaa67bT5MqXlXR7e+r^wc
z!M<mT2frZXol-xZY2{j1lX-Ry5i_yp6})<mD_@BDD++NFTdjgeFCaW2KDm}*6EE5Z
zxc85=-8gL<;pM+goA!;+BP{w1dWw>7npW^z`U$xG)9k%#=8x-`NtoF63-w!F!+Sl*
zV-4hzCSJ7*F5TOZs*@8|DqNZG*z~iKM<eo>dkQE=+L6~icpgognF1+Z*~`|2RCC<+
zc1Ug5u!&kU%@2#HMM7$3jbu&De$Kt5ayWp~P7UL+e)@@G%%CL{gBA{Ag4Qq_H>fV}
u4y?C&AmTzD-qCOw3DRo}85Rl&L2qCs4RXQiu`rVq)BvRn%2vXuck~~z2919J

delta 548
zcmYL_%}Z2K7{>2?-#ec9y3OcVb1!3ElN!e_2xn(E3TBgwiOL{EA*xlo`~ylEM37dO
zr-E8t3dM-RaMdn#ioP%tA;LxJ#$Blq(F{)Aa|ZFO4iC@yo!|RD8u~gk`zJz|7rc23
zXJQ6TFJL`v;|dGd(L9wGaV}b<)kSYUh1qC?&z3cu$~st!_Rw}&rl;FN4Wwz>((66O
z!#9eN$cg5gnyHtLYji|5)G-;IxeQK3jJa#E5K-+tt|o1i%mP(EU?iTx;bSH?O_#@)
zh4(!zt+;zd;PXKT*AMvQuHa|J5)$|-h+iCXP)PV3S`|2Nq?O9#FU4$07HC~whpF$k
zN|s^*-;yrV-#s*SRf11#Txu-P$%-T^Lb9q<ZXGr8rP1Y&RRvd{PV5SJX$J#MKHcBN
zr+5p8YXT#dgM7;8;=ldsTP=(WwlkM%zT3p*+q&miYP0XMdD<97EnDQBQ60<ibb}F$
zb8!rAwiS2Ud$=;D%V~s+-I98k$o28P$I5%F-Qc#V`bs8qzTS%;8C!Lq1*zP~jSio8
qrt2n>(LYm{?(g(za3+wpRQ+WTOYx2_pPxV3ueUxGN<7m2K>rWflc(nZ

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 d97288b7d5c2d4248f7a4310204293e4fdebf9a0..e59c83eccfd0aba392ac76ce961a3a868119ac80 100644
GIT binary patch
delta 549
zcmZ8eO=uHg5dFUS%wIQ~q|L@OBx|-mrzD#u>2;;8f;TlHUP^;4f}$r6A_$TuJqlv+
z-K3BO54DJ-l9Qk`YpO-8m==3ddiGGUia*qVb-MvU4+ArA-n@CtY+t&4d0Cgl(dP`i
zseWXA9z2ysX{d!eu6{Q$#@1W-BAuiUEsXmUf!Zo#V>WsaZ7+&x1*aul)K?kiLvgY7
zqN`JOJ37LA$*>%Z)A*V#5<@BNLD{d1;+jKmyz=)DJ$sEa!7vhoGQI~4y0MNKCBY|A
z43;SM)-J+m4!ayLx7ujx8a@S0y4UV@{64z40W+)NO~|B&n+L-ry+dV0!=ql4-^Z!G
z5_P^|R<<d91|9ohr!fqNkJE#n|EPQR93u-yWGsdaithd0u+#0_Ov)Hi48DYEMWxM-
zL!Z)Q)D(kUza9Fn;-j<sn9ga4M@+h~@1X67PZ0BBBA-MjVu};oi>tkHF-Kku6q1ei
zhszOeqMnJ;wOM>l#hgzdGb$!49P_TI`;dL`Ullw~YdELt)Kk5iNd&%D`TyVen9&8z
z*)yRi7W6^e>xypiC#Ysseg(Cx#p{?EQOUh%pQy>VFp*Qah4VR!Z(ty=@;t`!7QYT&
MQ2A0LSy<tJ0I;pJZ2$lO

delta 496
zcmXw#zfV(f6vf}YEf&+#*Prkn^w9@lEAJPO$j}H0i;Hbsj3!oLku)J1XA@cmoFqWb
zKk!%_)WM`;;v%%rfoPhC#?>F2lhDK{4yJrxvD?i#=bn4>*(iTmer1Gtq=A!&4l81C
zu7P$qiAC-Uu_Q^u2NKqD3id`rD2Atb_fRBNY#AXm!Ui`FMLNUVO`%@ron~*hc5@)g
zmmj|mNd-|-z|OdeCvu*zd_de*`ut`E-{lhjXyJybT=Io$9v+%HR%0&T^59q(>claM
zmX5n|m&+gh<!<)q6D(WD)r3n+_?js3+h2%9MJ$<T>9-hF>?RlZ{vW@6z;AD!^?n)4
zs+djX`SY27q-#F^+cQa5@j8{KWwcWoZ9z_#_~0Mf|L?{-kR2T_(=Ly7aO@~pl!LtA
z!HH0x4!VIL^@9>4fqCwSH<hie46UXyXDB>dK{cm#IZhbU0k1+hjbsrt4gOZa_T&Zf
zp!oD%)wdMEc!pb5VP#M>N9i^mm~|?{wlo?>!K%|e#B7b<JQFDPX&tAwMvoA6>a+&W
V(P#)iojTunA)sYwv(}p0qjTRJo7n&W

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 34128ecbf5961f8eb32522073f2816fab9097abb..182a460e9fbf3dfedc2c74c0e1a029de9a86fe9f 100644
GIT binary patch
delta 460
zcmZ8dO-K}B7@qf=boM7_oSiY<ogH`7a>Ly<7QsUl+hSdU&^_xM#AEoA-b(NvZ@TMq
z=#=|~2M<z4dyEWZT|I<J8bm~%yh=fkA%x!;c<}JPhv)C*eGYox^}YG+mtSp4$hF3B
zEs$cqGM-d5;HUqJ+EJFIjP!r@d`Jh)bH(>E(l;8anPB?23XNgBjwqN3bjSl03F&wY
zUq#GVMZ_3zs7mpK`-1W=JP4-P`1XaryyN+cKBe?F7-Do6S=EFVs>WeWm;C6Xf`Vz$
zH-WnJ97WY;$GgZ{4t}Vd{$WD1+4LtgMICHtoK^O~)hHYK46+?8*K!(1Mt5mb><HGc
zD%jBP&|{qHE_?O|lUkJZo#37xMj_Ni^Y{{S+5Nv>1`Q%-xU`6M!<GZ&L%t=3V}r8@
zA#X<Irve(e9>cE5=|gF_ZdE6a`uHsCpFmHmgZJ^2+&M+aB`kGriY}Mv(e2ZOY_o-o
z)m(aUbCTqv6~zN+bjfal+xAQR*PXE0?KSamSoEP_A;IY(ZY6E@(gO|bgljOA<a7ir
GwRHvunvnzm

delta 487
zcmXw#O-~bH5XYaH2ia~H3hnaJ#cp>+-nW}@^o1A`!o@@qLx>0L2@YKJ8yJddq9=U$
z$G3|t@dT}n+M|k5K}i}a8ce{L7{7rg5{V|lvn9-7GMV|!%zx&^rOk<_zjax9Be2}#
zpe^e2#kcrjr1<_jY(&T8!xe!?y$(hUpBC{f+H$8^m))xe_;bVO>S_(&ey?x~^AWA=
zG$dI6SJA|%5MmVHJPTv7Au@0)X43<dVp$$v$AX#SViogg3ulaaoNHR(msQ-3nQ8%_
z{fN1g3$Hog{6-DUe8v^qg%J<v6pHaI<&^J0S7Mm@F`dZr$v=n99lLlEx9~qPtdHy-
zs;Kl^m^6oo5tuf4ST?hKeh;(hB!233a!o`Kq#aDO1aeEoue;hcR`O3!1UbjS>DEAA
z<p?g=?d6@;xj5ZJzBkWPGkDeGVxZ5L4LJ&{TAk|ptK#p+kIE0Tgiq0A_!Uo3BVFqj
zoR$ixS!0OaFonpF5TxzZEUc8j_AL?LeXI^o9tojNT(*y4W#AW=7DLJPVbU$A=egMN
b0v;@=+YhqW3z%_Se8~h{DTV`Z(=YA=dP<pg

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 faa19791eaec30994273c114bb2fab776f6dfa9e..9f3eb8abbfd8daf34e30a864d5133e05267a1e0d 100644
GIT binary patch
delta 358
zcmeCNTxGT4IxCaZ;mNPq6ej;<)#aOign_}H0fH}ZOfKXRp8SJVkLl{s$r^0IOy7@A
zu4VIOT5xQ#pr`~J6HuMQaiCUTCjS$gE!np*GFDFhz#+>RHJOhymMQD(<c}P}lN&fW
znV+6zpBx|}KY2Ch0w%5VVBrKVPUfx)?2`>d<tKM@Ensr`Hu*lg<YYH)XU5l)ySQVS
zR(yx4W4iMlD5o%4oyUfg{U<wvAJAUE$?pXvC%5w0FuO5wOg_&f&I)o()8q#{2bm`^
zaZGk(6yLm?H<gQV!DK~=7Ur|{jFVrp$xl8mq04-&fpM}GyZmG^Noh4RMg|5(_Wxi2
z)DH$MK=M-~BYH3#lhB*&DfxhT<zk4Vy`?@fm8}N4QGy+$W91t5$%$g}lWU|GFzs9e
L^*QTgGnp^|hI(?&

delta 278
zcmZ2w)nmEgIxCa(p~*K{eVMqAOfF{&X3{+}`3##c)3qa$CyEJAUeCqJH1X(UOLkwT
z)MJ}F*tan<noqXplx38d9LpKYtZ|lovLmB7I}-x~!(t#?kWYT{FU|$bFV3+~P81cN
z9KgfE>~Vp8@<*WfEv^Mj4BsZ}aY#;{%I(a!a`H{?Smw0vaD_~>z5^u{CYSNpa31}^
z&fo_$({J)YF3HJPcx)J1CJXY)GCEAw=RL?6u=yiz9oOVdY$B7JB?_4@)H6=L#VS8}
zm!vLpa3ka7PImdpsglx@53`F*ek}QfIdU<?0WYOKGR3T(?7%6(&H^;Me+~O&LtgpG
SQZfse=L6Y5e@wn269xd0;9J4~

diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression.cc b/src/mesh/test/dot11s/hwmp-proactive-regression.cc
index 0314e12b4..8d5675dbb 100644
--- a/src/mesh/test/dot11s/hwmp-proactive-regression.cc
+++ b/src/mesh/test/dot11s/hwmp-proactive-regression.cc
@@ -113,8 +113,7 @@ HwmpProactiveRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
+
   // 2. setup mesh
   MeshHelper mesh = MeshHelper::Default ();
   mesh.SetStackInstaller ("ns3::Dot11sStack", "Root", Mac48AddressValue (Mac48Address ("00:00:00:00:00:0d")));
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 f0e3cd08c909ca4118ef4908f071863bdcab9db2..b07cceab6ef4d4919fb9b747ee5f25422f7b8506 100644
GIT binary patch
literal 6339
zcmb`LYiJWe5P)ZsCQVdqPlSq~#ur+veb}mqulhsqhl)iJkqY&N)(2RnAQd$zh=@x2
z%RfHq4-p?oD=Ok21L_}tXbVL}rN;LQX-{hf5$nueF4-fS+iS81ce&i|d^<ZkJ2Q7(
z_itSAK_1x0zyLsf;*a?cU_Rc{8O3veA9w>0u&>mIj?av)EHrGys7d8Z>vrygJ$bvf
z?A=CB=`gxN3RWTSLw!}OP5v;<z<zXggh)F)^7%DrU8|wMZ;juW?<dWw_;b2bPbvZx
ziwk*wH${kL+*D1f9BTTDlq?_VHGwG%R1FQ6#(82H&sBP@gqGSVo>*lsL$DBg(wQ{2
zwfqTVH$wp$BenFF;T!T91AIQW(a&gp0CZi1wBh(mXBVFQ;2df_iLJK7b?`fUXpNF^
zxH>4{u+(U&aRNTZ$FN4~>lRqHlVr(y5ZA|g@<t!)-dlaFJMZ+d&cD~kI{HEIKdDdb
zR{9_9Rm&^3eH3U?uNVw%)hC^_S)X;%B42dUhJMva>(@$q^DUH02T~7-I@5tKkq#)5
zZ1^q+OC7>RIM9=W@af(hgabcv5PtnrBJ2q1t)jtv7{=!$cTf)sXO7@&`y^;b)O9iE
zlV4d1`%yb{h$??JLwjc_pNCssC)VX+iMKlnjF>X!5C?#+#<5g1jN<?FGO86iSIov1
z_tJ-01&>sk#Rs9;x@QuDJLcIdIsz$R6;gCp_Cn$aT$oy8*y>)Rxu8#B9gq~ZceFz<
zU_ycCM+Z&m6~V-x6t;J?SK;lL>9ZCt!c>)&FqPltV^y);2IjK`*wfuhh-I8nd0Y&P
zi%UGQYNv(y3Q%2^tp6P5EN4`c;UXl9f3YUZOVnhf*VOWGdhFmVYTZB6t@ZCbRnfmv
z^a&c)3R)D{%u-cw=zxl*<=E5RxWqE9sf-(kn%}FHEQ*TeOqE`}&=9Nj#8NLhu$JP@
zN*1k$`BmkNg{=MV4o@tjR%NdU>nz#pjddU+%StlAHdepP8><po$rl?t$T(6JI<}`5
z8?xAxg96QtI$6^u9nwh)Ms?EuXr;know|L~N;AfU6&_MO2oEV9E6}7KG8o#(aXM+E
zBRXkC<8{*7C+MVIpQw{oGg(MV(iq}MO7y~E6)F@m-lA|?CC$rlYTYQyySz2=MI;#G
zc{eXZ-VG%3F0u9?D{UkmoT&9|iE0vcVrKQ>$G_Ah9#5Cp)1hXEa*tTuNtJG-Wmfdh
z3_(%p4sucSW0^$Qp=ey3C7I8vA4so$6wa*I8Z2wl>OM#8chSqN$U*o>We&m@t0cl+
zEpiKmGh1ZXED74HMf|gK5Pm8OOLydMahaXYymgLbQrsdTbb^Oht*@YtFQMce_BYC4
zuhP{m8xT!h??;&#Z{m2j_f=wDS<liJgKI{u#)*tYleOA`W@el_tQ;wfJ<Qvx!myQ9
S3_b3NrG77NV>Pc@l&t?JN&{2?

literal 14113
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

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 1fdc5efdc9daa42ed29ca01fd6ac314b9a8cc883..943faa860d28c9ecfd77af5de6f63f9d39b01c27 100644
GIT binary patch
literal 11396
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

literal 21037
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
Bv;_bF

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 e7f4ed21155b1651305262c4e47600d1df131bab..5f02ba69d0d76a48ee09c56352ab7b5fe612b1f6 100644
GIT binary patch
literal 7063
zcmb`MZEOrd7{_Ps`m#lOM?xu)^VWn=hrZBM<BMpbC`D<DN(ka5ZH351<h+MOw25fa
z4^kflkx1i{5J?lN2y&{3C5WmZKKQ&O^*pn8-Pzpi&R%aenZ3K6d4Bus%zx&2cCP>7
zovS{QK@!K%5FvZwKlE#al*4x{Q7A*~fG>n(C(hUgj~^7zR2wsH;>>Vm<Gv%LC1d~2
zgS+u69!8xeVFg(mZ0p9t+sOS2k^CP4L`hjjfy}QkDch4LW%;0mzDm|#%Sc_{R8K5p
zl+3Sc61iC5iS_iOMk=5smY9a42}dS7XPM_#5`d1iM$a6(=4?s{Twij?Px1K(!E?)R
zjpV{7mVPMgU^J{9^G74|;1i4ZUY#W1H~ELM{XXEAGJ+q@`e|7QHj<92Le}0*B*<F4
zf+o9}gQi$}W2IZIF<sXAP2}FsVuZO04Da;jk)ZR<=@ak#FVfCOj_LOx(2_czaj;E!
zkL7oaO*gn`-X%U^qa?sa(i&=OkTZRh^^JL_@x2@?A(|1g?mkh+YI~-RRrFjPYw`<q
ztlpRESoJYZe?m>jCqG-;nKrJx5=?KKn*Z?A8%0?J#gx=-Fm@JisE>10D7aJ{^}SX}
z>*!ZWTliKbZSb8++L`w%Y2A7na*2Vlvs{*Z;Lt){+X4+PZC0S!4iPaaO4(#gC>N#t
z5Tz^`H-oXWUjrhvZQXS7>)0oOUtWzXKc`_l@Ffl7vtQFN4t^V<F($40PFcp#Mf3wp
z*%IWIF(B)2kUEJ%V*o8=7e!)iL*vn71qlT+!&)QPTF|5LJ2{i?CPv<JsBupykTv$W
zBg<4uR*2p_=Z#ektl`X1IEiA?<iyMj(X;RgjwW2eQ=!c}sgf2rrII%Ov`X5zGb(9;
zvnpwOr{zc#B2Ql}g_O+TXhMagLi;{bCGB#7N?P7*m9#f=RMHO5RY}V%%(0eD;TmE~
z2~iAYEX5_GeLiO_6oiZMuLWrsA6=A&ac*%M#{beWzEnEGJ7+>~%ipgF&3{z|E#1Qq
zvWyDHFcg2+4AQdm>!mD=S$dBwiic=jO@k+v5s~>7rV(w2l!XtWKalygjCNeu>xm`r
zuWEWP_n;?MEi8OV87K}4+n4(~%dNH$Ccm@oE|8bF7IPW>rmR02seV5qeFkK;S5Ygl
zBxb%X1rPdUn^I=JgS6{FOY)mlV{LF1WeXE-eTnx)nkepzz;4v=1}48R;*W2lAd9T#
zSP8#PN8-Bo&gxyGj&*dcI@YswD#u0#n)BE!s8Q#4`FeG%;tlFpQ#Nw_DGZTOD$}~T
z2Z#zRs^w@x1*SqP+oY0Kx>+S{dYwwzgnE^<!UmPJNn5ygPoY9u?eCsh@gxcb5!xy+
zwk@S0AGe#4HM|vq#$hmao}IUNv`}j<ejVG!`IV}1pi$r#dnokUD3L|^PHI%1fR^r=
d4E`aYH_M`07tMcs&J)Y<$^7c3WwmWm)_?EbNS6Qr

literal 19653
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
V&DL;VuLm%jx&(lkDQk7q{{zoQZ2$lO

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 a7606da94377890f0bb07712c6dd4d33f08a466f..20f9e87a8df062fafc52a7232db13b5187aac4bc 100644
GIT binary patch
literal 9169
zcmb`MZ)_Ar6u@Wp+V0+3=?RiHs8FQ_D8Z`)Q4%0X6tzauDpg}a3zR=C1?rzh6ECuf
z32G~Zpd=atDVq3!4_f^uB>ahqCjDZGO^l5iJ{W`*k|u<JaCpAAdwV<UPIqo^-z0l?
z+u8S<H#2YFd-FQ}{kKOoR>izlC@|Jjys-y3TMobRvfwH>4Sq0Yc%S$TwhPV|H)^Lh
zG_^e0)%O;At!n3%*S9;J@Uf}Wn2M!4&*&L;<0TiXV(kOgN)W<p%%Q>$mr~R#!|FgE
zUmI7KS9Q)A{C(L#3VwL)qxAyKz_~)JnD*%gO4{2mQ_{A+LP>k4i;~u}k&?FQra+Tg
zNMj5Oc`Pr`q!to~mc2zuTlp^~ZE=B;_6SS+?`h(7dx%rg7HDa<2wrr&<UXW@)umj&
zF`%c=T`YmiZC6BL>BJ(0e@F=<#})p(DuM7obpqk`ngqg2^#sD^U1|0xEIeKoT;VXZ
zis3WZLZPFYbs87AAB%7!?RHgMYh%qHXXHR3t|7}jF=bpU#-c9PdaGW^(onBuD!uwy
z@5wo3vCJzfy(~8P<~$`Ug?c@%((3>_R+}x0m0!bspWu0Bcct7NO!t@RnNhRaCpeo1
z-*}BX<HLu;!QMXT_41d}JMNBB+?!!m2MZ5LK`C$XbA)P5!(;&(vTi&ju)MdnLRR0?
z!Www2iq{|qw5iu%6naZ*;Eh$G-W%7_vF5kYvFe2Pc`V@^3xurm&kFnO*?M5@N0hdX
ze!;cCOV0^3=`7>WepyFJ8}Fc`oqe8?cJT#D+QAnkZ=3V(qL;{@7sitA_~{rsKKYkG
zlkRvNnsJemmM5kCV^ivO`EN>^eTkBm->Ze=U%)4f#jub&-xp|73yDLU^#LU<PfD8{
zq|~i2L`lnkNJ;x+pB6ru1T5s7crw8x#XXsz1KPb`3nv35_mus~PYO$cvIYZ8vEZRw
zPC_J>PQ-+WJE@Qxjwa3;;gKAc;|M3BdJq2=)!Y52;V*z^)B!Dr#RWj69(Lw{1Do~f
zQodusefY32$wq%)>O3DhEC{(hR>W3sb!%Ue`d6`LHNqx#ttgAt4Xo&z72~R!70!=2
zwYuCkf#xkypk@_^Hng3Rwx@@Zmg}XYZQDUf>+GYXt*#N`jF&qE_B0d2LfUnKCbf__
zwB-gRZFZWH)?`xB8g8ScrD`c@*MJsXvufl*%?jOx8yV1<jovN@OAR7Qcv=GCGvL=s
zYR4V<%S-~{@jDU-ADNy&*gnJ+HLDhGAHjeit66EgSBNz$+`c_~C6(DgP%JmoLt5@V
zN}4%C6?0c{^X@e`*KmREe=%2|DXH=XY9n#xSr0UMZ3I_g3-p$1Bc8_%WLj+;>qDt2
z>O)n`J)I+KL4&~ZjJ!gYHj9pRlaTe<J#=~<o=wO4W)2<elSaY*q&Cr|jKXLSZl1RJ
zK7l5+ia0d0iIR5weo9(y9wn_~J|*qmW=h)dLg9ZIQVZ!9qcA!NKMJ=l5`?7&5h48Z
z0||uJw<HkGKA1rG>%|F#vr8%zu7+38KI#{lEw~RK1})xv`5EYm4ot{0H~UV;g8MM*
z0B`-O1A3xa7_%`u@B)to_hHsB@145=dekg)hf1#zK6t%b$-<L{4Mn|Zy-xFE-@&N|
zTGZhgS>`E~USoW8{~Jmc#(w*%O0RR=)^laC%pX;HO>*<sca<!R?e<Jfv0hAT?j0(N
QWqzU3E2FhuJE&y+2b@<JssI20

literal 21247
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
Mxj3|1Ao<t-0LXO1y8r+H

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 6f5300a02ac2d4ed38fe18e49cb8d27e8b42eb36..3ce66df2b66f5c76ee1191c18dbcbbfe9e489b8b 100644
GIT binary patch
literal 4844
zcmb`KPe>F|9LIlecWrmW+(j$PB=%57P`Z`2B>j;RvoKmrA+>VV#Qwr+2r-v7>f$AZ
z4&fZ4f-p)*I&K{@p+gYt!IKnt4Dk>_7Ynxco0)ZH>+Swt&U^5Nx3ll}ncth=_r2e5
z=I7o#^?(m@Et>_nYW>j00S@yq_7v|~qwxViFn7f{*uF8mvOsD1mL1X7#Esi9;=4I`
z>k8h*rtb+5tgtZ$=TfXzZxHtKdDt@n^o}>baSfQ)D1^M`^GE$&^sL^vk0b34wWtWB
zXG6yPVvZn74^xYZ!a{o`$?~9I$0)y=U}bK*6iZ+B6E8asRl_wT%Zq-Ur2I-iV_B^f
ztG$I4^2-X`1iUP*lVXi?)=@qad&Z#hfl0B%nS>Azk}XM75W{}PfZsnf>g5A$xXR{M
z2Q4S5HPdQNsib93tE4?^Q%SpjMkTG|tV&wvc>&GThNZR{QX#lAO@$0{S{WZ>pU0cn
z3=Zn&9sf6XREpJ@f{+2T^=K=x#KXXT(sY-DCDfuk>v^|2)>Mx=*4qo}Sd$mkvBoZ`
zV<mf;ou-5*)I@%o@>ppK1vQj#7z;&E#JI7~jd8yV;|&9Dj4!(|{^7=W{{zpzp~^cd
z7M-E;@C0I36d0=G+_><`pf6In_z84RHE>Sx!Usz<?F5yJXFzK^BE|X@7QF1dA}Ych
zMHDX7TrxVcyWE8_U7frK{b#e(Dn=@TtLJWtTR2Ko>x^$=>#JL&Sg$#&ctw$s%oq5I
z^o<Uha0CAj?eivkovZmJPoQyz`Niv~cbxgfXXO|4>?>!9^@{&q+pN;>&PtWE+N~;S
zpSG!_O;@X=?Wz-e;^f6U>D-+dUVC@OxN+eCKXRglY3Z-C&Id7L|DZaS_6hvTtCNcu
z_Z@Iye6L<$Ec-?ta^u2pWJ!dUUDU@0fnT!5uMWB}o{X*0xP%8%J4dCG?~s1nW(2<2
zXE3t#YU(o>*uqc;$y$eg^-_L?*~)T{6ic6{Qg4J+^$(CN%!+jCjk3my>ryQJ3*}c6
z>z*DVS*SAl^E}S9E=`K1&rp6PnEv6e6f3<mR46f<n>Lta>DU;_!pZsz%C8h#_&q_g
F{s4(Qaw-4-

literal 18573
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
Co`>K7

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 d322107d078f26dd42c46ca140d49a36576a95c4..1e515a1aba46750f6332c2004e7e01ee90fd245e 100644
GIT binary patch
literal 2271
zcmbuAzl&2r5XZms67ybyn4pE%nL<b<2_lLp$2A%o<r=|4B*Mumo*E4YVs+T;ors>6
zVxd*wDiOp&LE(zDDPm`lLOBbI`vZhHGi%fXZ|8vvv%7ga?=!#lO-389UnVGGIwlj~
z+OHojC7k5F$TG`B2XBDNbQT>M-*lmD_uiR<tuvj)ySP)laiw=v4|(#RGlNxA9g8Jq
zT+i~Wj{cjPnvVG;EWc&>)xzNLjLAw^W0(TxcokVGY|mH7-5j6rsDMxx>+9>RhO7k2
zP%83M8I=lADd_V~p9$Tau%e#F=7$4{h(#?dUo0Ed=pbEfm@M&LMm*|nP|~Qydfupo
zZb!Y0M$%LZv8aXh<1}HGSCOH{&zp<|D2KU=D(CypEe?11cFI-Y=f{@{p&Ss}(+h+>
zyo!wUb)J+ar|&z2L%fO%Gx>seY_qk7Y9a8K(gGpD5!I2GA7B2Dmv22vB7WKTeGTom
zN7a>BKBpZcUilZw3HMzB%UgM&yZzREe+5^UTE@GNu<Y*h5&r9`T&#s=d58RprSE+D
zyYBzIW8=T;F0J>Nn%$+d^(hU5mVQcNE^k7G?)F&;9ixBgtXhbbUReH%)i$><Xr4D&
zCGo3m`32e>UChPuW6Q4^r8gH$7I$*ErsY?i8k6g}SpK=?SBu(<J(DFJ#BGGX<emSP
q=g57!my6|BEWhT-Kf7<Tq<^}1mR}v}S0ChJ`G=NYT^fv^n5>@wh^3SO

literal 11692
zcmcgxZ;VyN6`z^+F8khPWuH<7ab@3!;?`8<A^%(|_yEy<fOauxtTACxnpMEKmC)3s
z+9!hiiOTXv!3`$6YDz>tY)xpJ{Q#?NM8B;DlS*mb(2_Np7-G|y5F<Tj=HC0}-Z^t;
z-|nN6%)9r!x%YR@obx;9%*;FUmv{RG%d)UtzRcL;!I$%U8M_niu~(p9mJMzg%ZH!c
z@C>#uIDYb6<2BQNSo&$lrr)rqvQPYS^JDlcwySy=TLM??!x9m06p9abjKOCUU{n#*
z`@d@7oWbvHTQYDHHoi|o%b|YI#*OxUUD2`!>Z#k*gY`uFzOHEByi!lyIvY4!3U0(+
zfv&MFU`T=CGuRBad2BEI7^mEGIc`!;K?U?J)Ihm?fHnn0V?TpBU{g47^Er%$p+eKU
z$eIMcQYCnm+MbXc$6;vO^MoX&H;kU2P0T7r{Zb9Hx>VB8$Uv$E?ZTXTqMg6Jo@k%X
zttZ;KdG$m)Kfj)6pDiG`n3L2Bc(1q!oQu-6&P9RwHfX07YMO;<JBH=vhors4J97uY
zY=s8nN8aY_R=8r1Vkj1`W!98YF}|fCgCWx<Ve#WQylfB8YmX7ov7j-a7e>&(hnEfL
zC?03Mqd|ueG*+$W!^;MAlvMmVIa@{y9NEr#OUiy`M&!Td$&7dl0Hzn=c4zLWdh=62
zGn9|)viA0znGs`l>5v%_*p_6WXxrk64690d60i(Ok(uVsC1w?q)Ri_Xke1<@$lJ>S
z%`WRWjHc&#H7g>v<g5g%N?JXSkQCW(=Q*qM)iZt<!)LG&&YzRhosR+i4Xo7efh+b3
zbgjMyY^t!qkDFkG0QC6{`7gLQXP|ce#8tH`?C3KE8r9>UG$qyCKbx?MoF-0U2GHHe
z5y}X`Bzp85fvHRdGQNBb5H{TceeCR0(`a3Ney{)*cosgY%M3*A1=L8TFaeBJCAXJ*
z*y)+mX_Y*_d77>b2F!2+V?To{_Fcd=&C9;J?}HI&KA5J6`X4)nl*~<nIAoKu@GCao
z=X{cS9`59Ci2fyTXenH=SD<U?f%ym6rKv42LU70vEz^_go`!9K5pB|VC~h?@%#CP^
znRZC#kc=gVWZ5LC3S!OLuPs)|N;d4w64?lC5iIiUdb@*SfQ_EAnTh|PC21x%b4S>W
z6E{iqjAY=8App#rG*I2-8)6OXT4_{|pSVd^Gt6u0<QtY?ihSsmv62tbp8*<L(DRCj
z7pv$kwW7PzBjbx6xJ^nROuViYOxyt<)#QLWyO}V;TE%P{)#DG`mIQP&p}-&dc0LX0
z3o#qi<nR$!)6Im7?A|vQ(5N2&c775tv%8V4fXA_;&&@<p<X7=+vskt{Bo6a1ymn26
z7r=L1MQ&6M@u`IXdKX-=M+-!icY>100Q7l?t0FwXn1>udz^M5uf|;zsBLHW_umnP3
zyY~>nV!5ZJgmD$ek+8#|w3x8A7d1GtO4J0m`lY(UjUFIOAt#Hb`0!w(7I?vFi?X<G
zeK0swk7k^HBCOF5Fd9}8RbB8WME@J08*Y%eIJ*CpM)n9?vG2+RvURB*3}BP>3~vJ2
zNWBt%FJBFVP|Z;K5Qi<h)DTC^h7vcvO6U{OVh~2t^(iP=S|3PZwd!-=P?|o^9wzkB
zX{y^tGIgT%x$8ATV$37OGz$P1YPG;uy@bTr95tJpa~y}wM~`R{CkL#%q7ol}osf7%
zt=iZ3|Cac4e;Sk5zoF?9MtaQV8m~+*kAqh?zpdxBc#%>Cs|?(MCi5EJCh}S^ikU?{
zk9h`Pz&x@hhE8QJnV!td6|Tf#M$qI+T;4_b6Vb0emS)QpFlt#U1-pPkb!IozI<tSg
zqoY&Nq0LP9)R<=W)(K)}k_R~N{y!2diPfSY7bI&@vL0~ht2|T$M?LrhNVM0d@BXCe
z6K0Als!!ve)AY%lB1R+Y-8!Uc8^%~n+oGhJQOT9{fG9!k9<%ipgG9Uae)k?R8fp9B
z`z~z*p3%OpW`r?o`xr>1wG9`JkAQu!(`%8kvL0Rg0iu@5hY~-7Zs;TZg`<ryLqnff
z#w^2A&`=*e4wW~@q0cRo34NqQ)MrW~p-+rmWz@!8Cn|j)ylY_>N}LH24g1KdiKEM3
zCPpJ|&%kJOZbKdjv~%sa8P5{bQ4&JCcZ(go`|x6Tk~j$Q#hVLY8#V|Z)omD}e$bPq
z@SSiPlCE%9T;Uv>Clx^G#c=##SSqrGdz)J1op<BWF)<yFA6}fC$+D-3{~&ZK<SVdy
z+TP57!q~iUnTlU>)i0>}eSl@C9yz(#-+=UyeHgCVPE*PAabpELO?BD@Pe43iB?&i%
z!A>)hi6Z~{h80w;$?`o4l((ols)HVaFBGWzIKPkgw&7eTBa6G2B#k^u9l%FE?WPXk
z<!JD?WqyF;Uy^X-M;^d?!DDET4(f<KhBd@f{=Jt+?8?B1wuL(Qj`Vh)MU?r@3pO+H
zMJtkK`bB5n<WD57_@3|JPkYFpfUCeCoJAUccD!!|4fr!0^2Y?F_=CoC=bRBfcy=W`
zN$|%P7r-#t;yt=`5Y-*}9sKAEt7ue@|9xc=aO9s^he5kSgJKxU=A$MygW_1nh!r$2
z=*7^WCaBGz?z1!|&Td^JH6)JwcCI1~>gI2SpKiUMM)mk_*CY*k=-Rv^?-ztts4#9-
z-bcf&yH0zVJa<ZY`RCIn@bbLr6L|T@*H7T(|4!uPk7tZiGH(3b|Bn>KrRIk%z862b
zU-vx%x}&p)kA7$a<TpN?1ng@Tj_B+QqZ5;yY(8pYi%uN-&y7~lAUaDz)?nUZf>P0m
zpzd;67BfyhDm65s(-R*VQ+EgE0B_i^-U7%^KC0Ui{$?A4x7)>{wHqyfV#E3*pxfI+
zymj&>3m{*+F$w5i90hfV6){=J=Ht|C-o~**&c#tj=xq~}@-~9Hz1<}qVw<IggtsSe
zN>1JF?Gb+OaT_3Ko0EX<g+fq*SP|(fn~%$kG+S<PE)*)EElp6$mMGAjg?dDHf49_-
zu;uaC)Dh6lOC~y3ZM6XM{%+lt2<ToT6x6g?5y>H&kEz6FO9Y+kTqE>_wlqO)wsiAy
zK=dx#CN(5%xoT^2>TX^Z#m=v7fPDEj9S}|8_V$n%{MT-qhF=?iZf}>w(Y<>tfc)RP
zlN!2fPC4{8`cXC?H*Yp?<Fu#Dbk&^U(Ay>`<!uCYdwWEj-46S3XoR<W_9Un7_IA5C
PU4p$i3CMTs(*genWwWaN

diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression.cc b/src/mesh/test/dot11s/hwmp-reactive-regression.cc
index 53a6376a4..e5cd924cb 100644
--- a/src/mesh/test/dot11s/hwmp-reactive-regression.cc
+++ b/src/mesh/test/dot11s/hwmp-reactive-regression.cc
@@ -114,8 +114,6 @@ HwmpReactiveRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
 
   // 2. setup mesh
   MeshHelper mesh = MeshHelper::Default ();
diff --git a/src/mesh/test/dot11s/hwmp-simplest-regression.cc b/src/mesh/test/dot11s/hwmp-simplest-regression.cc
index a0041ed14..08de6efc5 100644
--- a/src/mesh/test/dot11s/hwmp-simplest-regression.cc
+++ b/src/mesh/test/dot11s/hwmp-simplest-regression.cc
@@ -122,8 +122,7 @@ HwmpSimplestRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
+
   // 2. setup mesh
   MeshHelper mesh = MeshHelper::Default ();
   mesh.SetStackInstaller ("ns3::Dot11sStack");
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 beb9743463b9b209dfd28eb4a8bcdc6da7d93421..df0a9d1a51edeef96dcf3a533016024ec8778361 100644
GIT binary patch
delta 851
zcmYjPUr19?9KPpwwtF|{oH{o*-R7OH-I)^8`KQ`lt3)g)QL=|%kp|&gJ%v<I&`UuN
z<-Q7nvMYr_8D&v{kU6l(rzZ4NFZxzb>XQ(eox7>^aNu`-{J!7!edjwy|JcCGb}KD-
zvUWfEtX=e5R4U$Bb!TU_By~&0lgFyX1Gk)DXVD`Mu!FcS2U#A|axX3VvCe$xE3xpI
z8VP?&L+DXb{8FuijI-8$CLl?@VofiW{eH|TIvWDB1=$4ZY&rH8OQODw4ckfD2p2^t
zxNO&HcLN^C0a7CPX3tP{WSiu3M8b+Ig!3iiWn7b_S7Nz&t~=1r+-95i#0uQ}Nuz}Q
z(a`JTjtNGwR;-t1%FZQtQO`d}z?q_^HcXWV=uR6(U4G=t6x?&_bfp9RwJO$}2Hoty
zP^4g!hWBm`b@As(j_>w5w7YbApWL1Z>Szh5aFrW$I#pPFb)Udw_;5%D6Z6aEI<Ha9
zTCB7xI9j38R1{3}DI|oAXmVlgyl7w3u%s2=cQPj9uv~}k$^`p~3zfZ;ZA3WgL)>Ap
zCwIzHT42+oFKY0^-At2Bs0gZ1+y<>QZ;jE3U04;}8&w9qi^E%Wj2o^0>G0_MtGJsf
zKJ}#NR$>dt=MqKfnpd|UXqUG`^^rS{!KfEUTxH06s%dSH=|eVsOeL`pQt`-ZP%gP;
z14Gpx=>tKvsW{{_=nI+IDqPGz=EZC^|F|$X?+@}(xfr2R6C-vJ@j#AdT;fH2a0EZG
zIjB*;Y$DeJ!qzNR)SKK^vlB)>l%tl00`0T9dD4oMcU6Nr3zX;!Tlg>9{7&I<N?YKo
w5AbR0=C`RAoMVDBjE50}WwC$9It`jcDo#ZW)}7UYG+bY>nAQw7f<<liFL2oJfB*mh

delta 819
zcmYk4TSydP7=~xQe|L6QTTkn{Cue7N*FB}xu4|`t#K;Q~VpG%zF{lfPgvcNYx(EsC
zDhPXv4i`0o76qZvi2`XmM-d4HK@w&Z)Sb|cVPOBxxYpHteE;{q&-?xFT<+1kCf8f(
zocoN!hfZr7<$0yzu2o};H3ELS6}Y5~*obzihe<vG!wHX-1VK29hf<D>@y?g12c0Dr
zcHA!@?+l{d*1}o?ypDO0a$6k9T0zM18#yeM`tZ!AiBX7lSsa97e=Huw9Itm`$-ax8
zhD;YW9CK*wPuQSI1=^bkJ~{f?OynQ#RGolHIf#v=qij05f@53b0)~{}ZO^K!B1O}9
z<m{)pG!6#61vm7)5qq3I%$M8npiHBwCfurUAr*DPQ?Aq7CXC45!a6j*X?d`XX<3FD
zhl1V;jkaZ1CR&>@QrS;~&0Hc+6IzkM_68-0e7?L&WA~Lp%_Xfi?61-&7eiY0+6qg_
zamkSV$=hq<s0<lk){&6VAt@MeWyF)X=*rQ$B)SySeqR!z*M<3*6NjsHy0W@>;@D6x
z39VeUb!5ViM0EpQZ@_}PoBGxoH>TrG>~QPseB*z9YBW}ok&M({*R;^fOi_(3@^)c`
zc8^Bs%>~Ow4wtfAEKfJGMYovsKBqB)YFF{Xr?Wd`CN%7~ux@51H0~c|7c6E%y8{-s
zU^Npu5l9eyDC4iE;+?FEuP_vx6%V0Pk*P#paeZ3R#X6)^nd&3Fsp5dDi_NGAeWjEM
zt`6&LivbR>AN*VREq;YZ*=KGb9}BSU%fR;$4t!z)<(Mws<3Jxi#=g<M+GX5L%7u(=
VE&M5a!v=3Eq0>Ov*!W2D+F$;7<#hl6

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 6bfd75d1e8102315c55411a44849c776825ba240..ab31e1b226f918b8989e94df680ba9ae20b92f1e 100644
GIT binary patch
delta 1256
zcmY+CU1(cn7{|~1y!mL7wrO{oB`3-GO4gXHiCLGXcJ0ZkR4)`<Db!uaQW`dfUX|fg
z5Ou4F76o1V2S3IbC*Xx+!>O4LnMed>7gMI7j9my0D}v}ga7=KDzUQ2z!@$W&o{#_g
z|Gm%i>XRQIe1ENn=3;Au3O<Vmai+&&&*DZ;ot?yNXrBEgzLU6^3F6C8g$EP~2a*ZM
z;W65*K;M$+BT16>DUviT-qX;13SJJEcyCg|s+!_EQxZzLhCjkJwhN;Xm91koQs>RI
zmmk(7Gz}fUMQo~Sj$qIcJTAh^rjD<AZT^$)mQu`gJT3~4r}`{9<o<IUhx;vlJL4Ra
zz(6^O$NDXbWH+Q<%1YQ4)3M%fu^E_AwLg-Vqz}a*&a)E1kKrLKMr}&vafByOmi;Ub
zW1!8~3!X>&4GE2mj^_tecA|A`FvX}nif@M$%=QHFh-~#=t8i(TP;(xkxHvY1%bP6z
zZ-rx(#{&*gtSUMTv}B8(s^W&+=I6#mR!z|_lOnT+N>eDu_V8b)ylAc_iey|*_9DNz
z$;WGVq-dvmxWj%SX3@#%4KJbiQGQepfDI<ZFlTt5>HOA_O<43`7LCNiYz3zi^RzUK
zWkp^+<afOt%%P|&?&ZxW7JCtg6_wq>aivbJyPQJUu@Ilg2QU{(xVtcwtkCX)5R~zz
zuMbC(CE8zbD_<{onisw7H>pW_dTUpM;v=HRz(eU0KT{0gzNm)3lTG@f*zI+vKUWIC
z9MD?7r<WN!k0q_n_3d4%Ag*c_o5zS=r+t<G^*u1=6^R|`y)N!td}N79DjKqakF+@d
zTolYjG@RFK^jx*;Dzq>j@WzM6h=ThKi_#NLvU@-0cEC2;>;f95N+%|9*lg3)scw5~
zA@c*{XPLLL^({8PP0r%P16&w5<-@&E1GQnBKJ_^Z=0;ciV#5rmIh%hSaEn`)a#t9=
z5Z##i<$RN`Mct_f9if$!cVC|rn)Ftx!yV$+L|EJv-rm}zirVqycMo|*!+WZMXGUz=
zYq*(mF+|^+0>;3jMVo#$MbtC&ct%hem@L_}knO6pZkDbvzSJT6vuyLd9WtLVL>}3t
zZ8mN4$eid0K9}t5sLgNrJ+cGa1=;R9WKWDW`F@WKcURZ>yB&nec$1E$yN3rHwYY~c
nbdOCr7r_~clL&bfH$_76D4ghN)1~-s!lrjJT_L=-<DdTkH+)%7

delta 1140
zcmX|=YiJx*6vyu)yPHjRx7lnSGrK#lO($75S)0vlv)Of`2`%+SQYuA|bhRl2g(}7P
zKr1v&KonC%^7n&iYbRh)tRGso>IZAv{ZObPG=31ZP}_o)3WXv?@IkBh&Xf+!+`0Fh
z^FP0H&%Ix~xct(wl~&%}O>jGD;6$rSC-6sWo$kTb=yrNaeAC#IjNok4Vc#nFCpyJ0
zD0n-TjpkKC9w6d{(W2swwjy6s35L5foMj01>N;+=jnht)+BNzKwzk*#TsE-(t`Y37
z7`Wc<vA;Db#&_uireol{n8!ah0=J({38i2<6~Sk5mv6EH$hL$_PvgNvot@A5B#-nF
zGA&4^aidSgufiOGwNB&j+GM4y<EeG4>?0fRa3#!ySFImr#~Hpb5M(Lj2~KH7%o8T@
zbP!5(%%)VV^(1g99)&rQgP9aHH11DkC_7TZ_gyI*&|~<ibDVu%LbI$yr10SpE|u_F
zr_1IX+)AnfeG@z3z;H}7Qli*0t~ddOUA^NF0lHjvvMN+}uvcq$9ZuI!?AgKQUHm7a
zpX>J6l6yDR`SBpt(Vq8t#R&Vod%D+UpPKkuGjUe@{+7e_w23~YNNsFWwzHUx*@_a9
zq)AMuU6@J4aaD1d)sM-sz;I9)>g<UD95=H3hk-D*MHRpO7gZ;5Gan8bE)>=Xp3kRH
zO5aO4cBVD9tAI;o6Ehi)%@;76&a!U`SV&K?`9UehI)?<#6xWMV(-^%>;&jO-#FRMx
z)4|2?W-6G_us`0J5hA@F6QNdz-l%04DLsdiTAlZf1f}1nyKLFPq$>OJF#Evq0sakE
zzOrMOH^$kQWgq0djlQ2U7{?96Wsg_nuJ{Mz&oL}iOzbv27OKiE@w>WG4f`kaQOjdL
z)}%xun!8BpK`d^t(7N8^mzg|Cy&+k^3}%NdTwCw4-7WIO!6<|<S+a1>_INq$J2sa3
zuTXjbw;c<w=RKixrmTu>yim3=caO&&$_RWVBIQ`tuNj*Qt89xVk}H0eL-=sif<5Tb
zm$9>=`fJy)uVNuI<k7z{F{b+AFXRIDt3w`prcZ`94i`o4R|I>LKO1mIT0|m``&VUg
zc$FRF5<DbVw+QqmUk(M>*%1-CS70~kTLSqOKb{Hbe%ZK6k6{0(Moj_Mq#Fd3CT{+|
VN|WXUj7AUP$+0F~X_(a>`aiPzI9dPz

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 99a6342d8e2f0a29a09aa3f03a95fecf5fe0d01c..5b6ff501ad4bbb517284c1b00e8c270d511dd643 100644
GIT binary patch
delta 1042
zcmYL{Uq}>D6vlVX)UIQ$>+I+{<L>Ot?D{v&b=}m$snsMTLP3xyFvuV(f`}k0B%+|6
zGR%*HC}{Q}B`QdKC<;s~3PPjk$%n*;UMeA@DC(iQcQ&Vofji$l-*<lJ-aB?+?7+QG
z1@xv2=>iQ-NdQ5~77wdF+$cA2NXiITaYO2*EgGz11;15Ec#WdMUK)xrAtvm@$->=q
zECwMI6LsB(i)jOqH4Y8NR}A8q;ls3S;5(E5SYD$CMYc4Q@cDXu?8Bn2AriD{L(=mF
zDt+i=6r({~n8lX{3(LV2Wvf_%iEPNGT(ui^CDcXTwH$}W>yRy;ru%iA2lJt<a0^<=
zOX^5tP}a~94InAobiSGW4p9AiOf;%~VgRRG@mQXwyX`m=9-zIOyp6M)T_-=8KVh5d
zvtH1UV$;zM_G@BZvBe70kHxTowo+RhW@|HK;4)i3vHTb*Fz~h179OFgte@T`a9uSq
zR<@4LB_XTsv651WbeV<}1)xMSl&OLc(=Zt6qOK~p=#?(fH?AsJ(t~&(v4sg(<vJa&
zamCqq5PQmPx>M^0ea-|hRi2^II_8d1`&y*b9$`C5)KV;H65U?QD0-;B-XmCU;FaR8
zMn5`=<EYhgbg<Fg<@It3b14&2g+n`<Ry?AT&QJHD!WO&Pnor#wwMC~ne;PNVHjQL>
zE_Jpr%mM0a@gf(vqF^MpjjpwNk&A7-zlyLvPRnhs%txQxfZ?=>pSnXoHhRSq?SB5Y
zCg<a)NO+8Ny@eB&LmyVL=b-vUcC(lK>`9o|nQ$oQXU{^N3@4uo!W8Z`YHq=^C`(fV
zy!J;dKYDXjjsm*dB$$+hvzSd;P^ukz5qHHNOA>3?9dpd3>Tzl_xm>8Q2p`Xx!-cek
zw>1vQ3D009^Qe=x47G-#&QR9HT)m1}9zt%Ip_i*&!ledAILZjy#XbL!ic&c`5_8+g
wybbq+7}pH-yG%vl74@T$2YcQ$PQQ%*VBFEiz-DNx#nu0g{fRu;aPw8+FLuWoWdHyG

delta 975
zcmYL|OK1~89L9I%Z#PXfwrSF2lk6thw6*qOl5MKRx>~g$Dwu*OinLS_!N<Xi2OoIw
z?Ay=c<6u|NqM%qPs23lh2SqCs#6tz41utUNLO~QfI5P`+Smr;&x8L`h|ICaY96dPp
zwVDq%z^P8as|z3$bg9$OFcQz;NU+2PF%m2@9p8f%yNV?>W$I07n5j>(R-C9Aq}8T|
zeMX9A#dyKVAhy`!&1w7ynshj$;bl03pJHjk{+IA{i5u+AX<AtmA7-osVj-9R$*F(d
zHfq=)qOXKp%y;B4A1csPvkIh*EgHV((@56drtP8@vHX4u?4<*IajUYwzO)b1wY}^f
z5_NC*tb^NOlhU1pOVtL}rvj)7yL6x==Naq|yZl)fUW8wAw+CnH2dH<AuateTA})XA
zDue#D{|!z>TpC{I8%&G(Nk&)Z#b_V3W&K(P4M$xXvgJI3g{aGRqu8*6pUfd_L@u8W
zVYFcd<r;O&2UC2k5l%w_1s*^oR^n4lU}ggQVtst32}d16=b}@Wo5gAbb5;nSV=gPh
zj$7PnQHzu55cbAhzGb;G`cVqtdAvl0R$U$xjkKweuWA?R+xVt->@`e2Drbu2ma&4$
z9X`vRJig_#Xia$ha9-)^3wT$^BAE1OS5b*5>i8S`l5}aas%3Zk=vt@W0NKC0DVJWA
z{NPhv0&{?$?UIJfxMD_e$=pI8R{ELAZagezk+3}8*8Ok8-@0+$$>O)=k+a&*z1gG7
z3pGBSKF!%3IPEr$+a6tCB=1MOibR`!A>3hOcg~|~UEYxRczxpp<F9MQNg4sEIF^!7
zab4CmmfCHp+2ct|z!}P87?TAXk!2ozOzX&!ukFby%7tYf-<p+_N;`vdj*a&%9yR5Z
zR%Nt{la-+3%LQmrfL7=eX_(5VSib<Q&`^~RH`g)2*kg?4*RVsF%UAdbQ(-I;aE8FB
li1&A)Xt4!6C{{ShT$Ak)nH65Paj|I9P7y1k&UfBme*t+#6ubZc

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 1dcfd5dad0e4242d6348450b1612be3813171c09..01686124c18f58cd400ded2c0ad6ff53bf558711 100644
GIT binary patch
delta 548
zcmYk2Pe@cz6vp2@*LUB%nR(5?n|d?)dVjK+$s)>x(cpo^fY3q-Y9pwd5ZqMs2ZEw~
z1VQ!fO7IDWsGDGxxzJTB1s9=<K!;kmC}CQ(X`%N%|BSoyo$s9AcR1Vq+x=gD>m*9p
z(}(%2t6{@-4AL~M>}hD`eY_Mg`w!O`=VKQ&JU-{+lW~n!%6O-j@HTBAor)-|NEu)%
z74cs^2?KGe-nroIGB)SzvL_u6CZA48s;1B@y&UiLVzTX;5f?X<_VGg2OM`81OX^ml
zebmwsw?c8WSLe5q+Q;8?L_-&FJ#&|CcVo~B@HumpM!OMOHfGM4>@`}Md#r(>>^MCt
zt9I5tKIB<Nz%zXO%trM5vh-YXu1Lr*t0J%pYQM2)jWPbM_c+<WrCh{bp_wb-jxf!M
zn$SihZv-1w33IuK9@b8>H?f~vC3iqIGAF5DZ#H)FJ;c|9`cxOH_B{2Smor73OVS(s
zu~+G%cSO;JYI^>Me1N?|O!tE}O*!8~?Bs*S`dO3sKmG9cEoX_Q-Gta7M;u8E@uL`1
ZwM|t<(^J&tQcRUoROOh5)alMTI{+!&jllo_

delta 546
zcmca_e&2k<8&;-M5|iJt`ZA}=FigHEEIxSw2MhB{S%%3E1>`4Jvn^oUKUs!7cJd=;
zrOC6|^_lC{;i{OlG$v1Am7Ltm#Xk8ByA4w}h^sK!i^FE}5)ON*6>={a8JCE^U@T(E
zO)bt~00Jf;o^QlFc_OO>SeFc^4f9hlUw(2GkbT}3A$J4F7qtWN<tLkQ*)XqCV1w#&
zX1)hz%TNBqWyADXak2q-Fw--o$@aVolb3SqGJR8;tjH@oc|IQ}qw3_3+#!qslihe?
znRrw|!aTw-hX|^%O_pPqpZu7|hN(y!C?~@tqysd>mq|$nX29lEyfKW-Ck$a$vrpFG
zw_)0D0#eO6!<3D|4``a-<cqwLla~M`R+z#xG73)q&wr39%p4@Z4Y%{F#pVYBnoP_l
zY@kq-o~$msoXJfVs78X78EDen$!~=ZGOd+^n!?Hk5;T;bB%m<)oyY>FG6jTbAek46
zlOG5uY(6K-$;8~v3W=AG;;WgK%79H|0V+`dny5JWj>G~c1B9s{iC1zUQ};+NVA4l2
O6(l1BF?EiVGa~@>Q;~xJ

diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc
index 793de89b7..aaaee161b 100644
--- a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc
+++ b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc
@@ -140,8 +140,7 @@ HwmpDoRfRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
+
   // 2. setup mesh
   MeshHelper mesh = MeshHelper::Default ();
   mesh.SetStackInstaller ("ns3::Dot11sStack");
diff --git a/src/mesh/test/flame/flame-regression-test-0-1.pcap b/src/mesh/test/flame/flame-regression-test-0-1.pcap
index 56dc61fedc8fb2d278d1d275a2733fa58069183a..4d23035c503ba792074d13b7682ee597bf08142a 100644
GIT binary patch
delta 5
McmeCtl$am^00iX$b^rhX

literal 5260
zcmcgvJ8M)y6h4!??kgcCAT~y_0iQ{flnNq?U|}N>A4Nb&Awn#Ih?R}eCW%cNpJ1VA
z42gx&lr|fz#6}@t+7#lSP~!Q{%)NJJ?^$;@tPb4gnVIi9-*;yA?#8DNFS{s5aogS|
zn&Jn;$HD=k3BKZ(i-@+R@dHtpcTdEzl@&fwwaNpH7mJE{GDXVgWJ2y)HYT!hz5|E^
z_8jz)PT@6U$XWUTA%04b>`+1Hm`RY_xOjexiP4y9i;;TyierNhX$g<oA%%y<wzFzH
zIAfW`##-cY=CF?xXzS}2YTLCFZNCmH84Fj?UL7Ht<|~f5$SH60@%0aRn9!Rdoh2HB
z2GxEdI1KG;hDtPmw|WCejnOl12ri;`Mu|@I6-QnDIgR=_!i_t7RpHmB%|r~EJ=SnG
zH$s_>Gxe(3n{D%aGyf_=t&W?keF>$NV&^qbEm<3hLvP0$A~|jflA#?S{l1{Mk?{C_
z(dVI6iqnrrByKPdo2#7D-N3CT)QXKGciiFhlaU%%#o8sMV*Of;6d%cLaSkn0vCuxE
zQq450*yooOZVB_{D+)J@=`vQhnND!S^z*YOtDB%BdTY)!S?Lw-#f?XJ{@I@fTcMHD
zji1_C=|I2F=(?wf4$Ujv5U>TooGS8Ax0-gz%h1!5TT7k-r2IhPCK)5T#nEZL;z)ML
zz|#sxxbX;2w+?Uv$kE;?tDB(XG_gC%aueq94m}2D^`2U8wqNWir`nFEK)=E0x~GV)
zYuq4c;;G~2>qeB99+Dxx9ORcJ<<^p?7`)P_aFdJ?UF=tMvzV4)q;NBx;D+V&`C%@r
zo1i25@lmdcr&aF7jYoL(W_1fa<sR*L3iL0Gu6v5;i^mGLz|$)C;ud;Zkat$!*wd6-
zOP&IK{)xg(GDdXjslv@-I!~)YBj9GJ1KhBjruOBtx(Pa>cL(xKJRP^(c!cMv<raF%
zskY-O&=(k8_Y~1<`xS11r;c0bX;BDUePd5kZY_BV^ua+7y<7Y8|Ci{+ilU6@4Q|(m
zJZ|x~aZphTH$xpz28+4ys^Ha3@DIVcGbR?)?E@A)tQk(Gotgpq5~Kh9+uNasRZ+@*
zEn~LZul-y!mnUs5;cR7j8P-^uOG`Bd^s9@7Z2gNui00ok%+!5fSA|C1zR@7l%_Sw%
zpk^ku**cWzy=4zQUQPc69b47%ky2J?K}U4{XvwQ*?f-*QhDUgNU`gZ(>zQq9r=EfS
zjM4Qy5YZFE3b$YnyeTw-8X)SHmsa0+4@|kWRG&Z}8d11O#)uvtRk#J7D%?ybxM3?f
z_pY4PP0$gotd^U2>bQlT+G-Cy<y7186zF4&u6v5;FO6H^=?wSc#ypaGBkGZNp{FUg
zmOKUekM{~U$r#bSYl?1xr!zt$;AT3(4a;f$WKZf^yh~U&oIVacbj?<K=o%-}j%z^w
J#^}0he*ipR!a4u|

diff --git a/src/mesh/test/flame/flame-regression-test-1-1.pcap b/src/mesh/test/flame/flame-regression-test-1-1.pcap
index e560e3a8997b22c9718bede725627408c3a9c7b8..37169e367bbbbbc67df30d28df0837e2fa10a879 100644
GIT binary patch
delta 113
zcmbPcet>y`1RE0r1H%M{$qlRuVgf)W5HK?^tXc&m7#tjc1k=QQdSFG@K#C+ME|i(P
qmzihcNo6*W60lBnM&`*rERrxW9!8Kt4yONLATU``T7;1qXbJ#7yc^X3

literal 7062
zcmchbO=ule6vxkf6O+6&rY&{VMtmZQHmPP&5TVH1=*EKeb5R0zrxjZT7j7)nmC?HM
z8{D+EwHExUE?TM(kgohdBs+B>sH-joyNJf~b!YB*_YCh%-q3-W$-F!7{(t9x&pB@<
zYu{ct*?|d&+r|dKVY~>qU%U<AAf9PoDF8Nj!wY~S`5UhQ&Y#Bv^!s=S$yhNx31J#0
zCwM}<b0!4+F8)O#Jn&z=QYV?sDuvA`oxVMdX&(Uqboj_L6id8HW8%+bER-?n_hKXx
z9o<P&eT7PMc&2>~cizf~@43U_kojd+j{_s-SsHPyqf*Af8Z_CPy8({knf8?}#t&6t
zMeF>4W7F^ez!Kfp-wr@4OpdGu=)$~y+c}Z?hp3*hu`Z1k3kh4HY~nz=VwNq~)!aPW
zRaDQ|O5grk1h^j=X&<N!&HrsUf*bNCd6Z_eM8ZqDb5HGT`VD6`j5Mi@WVVOyuANP5
z&zY@LH`_B0r<rQHfJWNmKnEgCJ4976LK!GOgq^ZQZGxQ#YLzrnM=6+IG@{b#BdL;?
z_399^C99WKMAg}}USlM{(Z!g4LZvK=%7}M8mU0+x)jucV&SoNh&?tGe<V1|#QXHJ3
zSY-o!k9)a{(|X1mcRcPyT-MD~PdGK5R&(LxCg=~8(quJFju+5f4a54)^QfM!MoGTz
zv5BUxvBMVHV*B$+hmCdVu>aLi_379Pl}gs2$EShcV)<d0sw>ntylT>?Nn{z-GvC-5
z8olDNiKY;S9^Qo;ext0W=-b$ApRPD;tV@R<UaR#@m3u@s*r#vc&uqR`zKxV`r2ZSK
zXTGs6jqZKjVKe#GV+_+-1GL0;^9hHIeItacHx@(kZAsYDH3em}Yl?F=$v0A8NA=7%
zc7_h0%sFhL$@~x;w&>f~Z0~G!*h=4yY;)L@iVZ824LQnM0GO09KH~E-KTlP@jg)WX
z%rR8YeB+2|^qR-UuIe+B#}?XR`+d8^#?DZadgHB$A^FzFyKqC^%s0EHct?|bBlQnZ
zJ@bv7q0zaw9X8R_mF?qQxTS2-x3Ss&LG_HS^lksU4x3U5Q=d<!hX72;7$0N4Rlbds
zZ{*A}s%LB*F^zuhv9YT$-}($-*g{)uXWnzz*cob|i@PR=<l6yZOV>2|X4e!$ZIW-K
zz7N$i-`E)%{n=wP`R1@i-^OOUJnyiTzI}H~;+uV6RAptutE5h+*-Tmcm~WMDBjp=8
z^9!nHzOgQiUg{-m@fpeFo5L2MCAL$yI&AD4HTUmNP9^zfpY+)q?>7sS&8{hi+9cmd
z{otuub?p^P3^CBb#F??xcbuLY@~*7vHfOr|+bzY?JCnv@-rbb+ki=qVo8b>_23Agv
zl!2tagzA0<(&+m*TJv84eS_^Y#z4obiS+E*+S&B&(3!0RHM1>z<oIT)<B-SJl5cD0
z67|?OuABNdA3LkYnNL52&)wNgYSUzt=8HOmS4mInvR$@1FbSH}CaJ%S>RCpyE{*=`
zv5BTuuER$Ed82J?wkvlzY^861?5_1qm0w^ClkEUo_(OG8pLHwWMyf<|=5JKbd}Cc2
zePzL66HW20aM(gyY|kz_Y^+Nyb@sEFA^E0kHs7QY?V4h!P4bP@=TSZLjh&&<7d<x7
z)O>T;0<^@o{JFzc`gZP%THn-_;}`*Mc$L)YEPrP6t@3T8d?RNrqI%{V>(c1q3l5vf
zx8saq*aEb~_UM-m8~a9$;OTp3t9*;SS5{M9Q8v6ve3Lp=XSGf-)F$~x>Mx;s<{RtM
i=#ME|d}b3(%{PZF*6G-6H{ItrbKTVcMfJ=Xj{1KnL1jw-

diff --git a/src/mesh/test/flame/flame-regression-test-2-1.pcap b/src/mesh/test/flame/flame-regression-test-2-1.pcap
index 0d2d0701fc1e448541f44a65aaf1a4897e756179..7c09bb44c522a11cf51efe5c2d7b7eed3f3f2589 100644
GIT binary patch
delta 68
zcmZ3ceSmpF6B`o)2uzeym^_b}eX=_TA0yMmeR^!nVByL8Sk%E{%pfrqxKalWQAQS^
F5C8;q4r%}Z

literal 5542
zcmchbyK7WI6vof&jr&T}q_NNx8`M0EN*bR?*v7&xDp~}DR6-gN3qdT5jY+f+QPIM}
zpb-)wM#VzXM6B#m1S~a$So;S^Jl~nQcW3sVW$)(Uz~0@xGjqP*obSx+O;*2tn8{Ha
z#ch3^Xq>+oe)aDs8s&GqrXr$sY5avK@;>u7qWO8gP_@bz<Ml<wJeeZp+aw^5EF0tI
z@+XK$$HM~+m2zIRP|0jWY3(4<E>^{B74m2a$8xXFamMyyVMIB(+Rrj0Sut~XeI{A4
zonhj2+O=aOhOe+vibH0gccG8y8o%Q;6*&%{z$%9Mh#4JCk<JngaR91z5h3p&SvFLn
zZrs%yCjTDr)Z72J`pO|CGm>|(Ee?8Yac1m_UB2DAc!uYY-xqB>Gm}S%hFJiwx*g%_
zwA0Enk+1I6uw|7R_|Z6;+apS}9QixKi}rTJuiap`x)~LX&ELtj+O=_|b}c*V2h-6p
zblz9e>cesS9!Raa0Q|Xbm&mz*_>}AyDE(!n)GkRl9$fG_f)%?}RS+@Ut-0Xr%DCe1
z7kwqSVw)pZS;~qH&PA)v*NiKEaY<RRDB&`9S*d=j;!X#pVvIZ99ZjnGk@1L1d@?jS
z7e2Fk$_>%Q<>fuo<jkt@C~nM=><w~kHka|v<ZrE<Sx}#zG-)<jF?w%IDQs3#_{mgw
z6gQtO&fBKh%J&sEi3;&G?oFNb)+@^vRX`S2v7sGu&yM3?SUKx!dCTM}!vE3OL>Hl}
zJEJt4qY`~HByU09$gzca<5{hE3iW|qQ3FrWJGxt8vznGrV~g{)X}0-Jg-xP@ZMI8c
zLr44@9l5;mjASnu%F75lF7~vRw@jX5@+Vf;_bHz9em-t%;%QYd>O8e<VcuA*6;Gl5
z?MYjjO;(KFrKbv;)pVXJY;oQ;%{Ki^VUws}8-K2_S+6Wx<k)zI=V^hb%DKYV*wb3x
zGI<L1Tdb~oii2QcZ@!7ABRq;5D<^D3mMzR1i?!k@)W`Sb(`=F%^xo-K*sP}WRADn)
z#a65+Y@!aft33)^;HhH^JuULodQWS4%j7B4Z?d}XDK=YWrr>!RKHWf`wDXO~vW1?q
zSSy}Fz3{4`x^vB)V17lJtx~@-TS#X{)&#cvn?jSP@G6hu7P?kSKZPUO>BiCAQ)Csf
z!e}{a5bf@qm$&$Dr=X(7Bv>6=S#H{K@hMSrEmK8dEst1TuPAKw<-U?vQQC9+m|)bM
z5+%7ARuqf1Qc+N!>o29*WX0&69#Gh<rmMFx!3fy!w=CMG*?I;QHi-(hqlXo?z|-r3
zQRiv9+zdUf<t>w^P#<P>-BWD!v4wIIPaPX`cqhNDw=i!k){3W4KliSjW|I}8x3Z|P
z1)eHwhPH_9*L#Ic)WNprqrw(=I>Dp3@r)#IhC1Y4=xHr)nLLGhFRSaGN<km%XyWOF
zU<7-C$ktovDT}q@Db$yad+PBC=ALjw)@-Nx>k}R6%t*e$cKf8qrvCRwVKZBmnJ=e2
M^*A#@J#Ux#KbvOOH2?qr

diff --git a/src/mesh/test/flame/flame-regression.cc b/src/mesh/test/flame/flame-regression.cc
index a77d41b77..921374739 100644
--- a/src/mesh/test/flame/flame-regression.cc
+++ b/src/mesh/test/flame/flame-regression.cc
@@ -99,8 +99,7 @@ FlameRegressionTest::CreateDevices ()
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   Ptr<YansWifiChannel> chan = wifiChannel.Create ();
   wifiPhy.SetChannel (chan);
-  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
-  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test
+
   // 2. setup mesh
   MeshHelper mesh = MeshHelper::Default ();
   mesh.SetStackInstaller ("ns3::FlameStack");
diff --git a/src/test/ns3wifi/wifi-interference-test-suite.cc b/src/test/ns3wifi/wifi-interference-test-suite.cc
index c0f215f07..d29605557 100644
--- a/src/test/ns3wifi/wifi-interference-test-suite.cc
+++ b/src/test/ns3wifi/wifi-interference-test-suite.cc
@@ -137,10 +137,6 @@ WifiInterferenceTestCase::WifiSimpleInterference (std::string phyMode,double Prs
   wifi.SetStandard (wifiStandard);
 
   YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
-  // This is one parameter that matters when using FixedRssLossModel
-  // set it to zero; otherwise, gain will be added
-  wifiPhy.Set ("RxGain", DoubleValue (0) ); 
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0) );
 
   // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
   wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO); 
@@ -172,7 +168,6 @@ WifiInterferenceTestCase::WifiSimpleInterference (std::string phyMode,double Prs
 
   // This will disable these sending devices from detecting a signal 
   // so that they do not backoff
-  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );
   wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) ); 
   devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));
   wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) ); 
diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst
index 0b95f451e..0171c2e49 100644
--- a/src/wifi/doc/source/wifi-design.rst
+++ b/src/wifi/doc/source/wifi-design.rst
@@ -284,8 +284,7 @@ The PHY layer can be in one of six states:
 #. SLEEP: the PHY is in a power save mode and cannot send nor receive frames.
 
 Packet reception works as follows.  The ``YansWifiPhy`` attribute 
-CcaMode1Threshold 
-corresponds to what the standard calls the "ED threshold" for CCA Mode 1.  
+CcaEdThreshold corresponds to what the standard calls the "ED threshold" for CCA Mode 1.
 In section 16.4.8.5:  "CCA Mode 1: Energy above threshold. CCA shall report 
 a busy medium upon detection of any energy above the ED threshold."  
 
@@ -295,23 +294,17 @@ However, the model doesn't support this, because there are no 'foreign'
 signals in the YansWifi model-- everything is a Wi-Fi signal.
 
 In the standard, there is also what is called the "minimum modulation
-and coding rate sensitivity" in section 18.3.10.6 CCA requirements. This is 
-the -82 dBm requirement for 20 MHz channels.  This is analogous to the 
-EnergyDetectionThreshold attribute in ``YansWifiPhy``.  CCA busy state is 
-not raised in this model when this threshold is exceeded but instead RX 
-state is immediately reached, since it is assumed that PLCP sync always 
-succeeds in this model.  Even if the PLCP header reception fails, the 
+and coding rate sensitivity" in section 18.3.10.6 CCA requirements. 
+This is analogous to the RxSensitivity attribute in ``YansWifiPhy``.
+CCA busy state is not raised in this model when this threshold is exceeded
+but instead RX state is immediately reached, since it is assumed that PLCP
+sync always succeeds in this model. Even if the PLCP header reception fails, the 
 channel state is still held in RX until YansWifiPhy::EndReceive().
 
-In ns-3, the values of these attributes are set to small default values 
-(-96 dBm for EnergyDetectionThreshold and -99 dBm for CcaMode1Threshold).  
-So, if a signal comes in at > -96 dBm and the state is IDLE or CCA BUSY, 
-this model will lock onto it for the signal duration and raise RX state.  
-If it comes in at <= -96 dBm but >= -99 dBm, it will definitely raise 
-CCA BUSY but not RX state.  If it comes in < -99 dBm, it gets added to 
-the interference tracker and, by itself, it will not raise CCA BUSY, but 
-maybe a later signal will contribute more power so that the threshold 
-of -99 dBm is reached at a later time.
+In ns-3, the values of these attributes are -101 dBm for RxSensitivity
+and -62 dBm for CcaEdThreshold.  
+So, if a signal comes in at > -101 dBm and the state is IDLE or CCA BUSY, 
+this model will lock onto it for the signal duration and raise RX state.
 
 The energy of the signal intended to be received is 
 calculated from the transmission power and adjusted based on the Tx gain
@@ -443,12 +436,9 @@ add their received power to the noise, in the same way that
 unintended Wi-Fi signals (perhaps from a different SSID or arriving
 late from a hidden node) are added to the noise.
 
-Third, the default value for CcaMode1Threshold attribute is -62 dBm
-rather than the value of -99 dBm used for YansWifiPhy.  This is because,
-unlike YansWifiPhy, where there are no foreign signals, CCA BUSY state
-will be raised for foreign signals that are higher than this 'energy
-detection' threshold (see section 16.4.8.5 in the 802.11-2012 standard
-for definition of CCA Mode 1).  
+Unlike YansWifiPhy, where there are no foreign signals, CCA BUSY state
+will be raised for foreign signals that are higher than CcaEdThreshold
+(see section 16.4.8.5 in the 802.11-2012 standard for definition of CCA Mode 1).  
 
 To support the Spectrum channel, the ``YansWifiPhy`` transmit and receive methods
 were adapted to use the Spectrum channel API.  This required developing
diff --git a/src/wifi/examples/wifi-manager-example.cc b/src/wifi/examples/wifi-manager-example.cc
index 402609aa1..0899d25f2 100644
--- a/src/wifi/examples/wifi-manager-example.cc
+++ b/src/wifi/examples/wifi-manager-example.cc
@@ -336,9 +336,6 @@ int main (int argc, char *argv[])
   WifiHelper wifi;
   wifi.SetStandard (serverSelectedStandard.m_standard);
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
-  wifiPhy.Set ("RxNoiseFigure", DoubleValue (0.0));
-  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0));
-  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0));
 
   Ptr<YansWifiChannel> wifiChannel = CreateObject<YansWifiChannel> ();
   Ptr<ConstantSpeedPropagationDelayModel> delayModel = CreateObject<ConstantSpeedPropagationDelayModel> ();
diff --git a/src/wifi/model/spectrum-wifi-phy.cc b/src/wifi/model/spectrum-wifi-phy.cc
index 70e94ba24..892a7ca32 100644
--- a/src/wifi/model/spectrum-wifi-phy.cc
+++ b/src/wifi/model/spectrum-wifi-phy.cc
@@ -242,6 +242,14 @@ SpectrumWifiPhy::StartRx (Ptr<SpectrumSignalParameters> rxParams)
 
   // Log the signal arrival to the trace source
   m_signalCb (wifiRxParams ? true : false, senderNodeId, WToDbm (rxPowerW), rxDuration);
+
+  // Do no further processing if signal is too weak
+  // Current implementation assumes constant rx power over the packet duration
+  if (WToDbm (rxPowerW) < GetRxSensitivity ())
+    {
+      NS_LOG_INFO ("Received signal too weak to process: " << WToDbm (rxPowerW) << " dBm");
+      return;
+    }
   if (wifiRxParams == 0)
     {
       NS_LOG_INFO ("Received non Wi-Fi signal");
diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc
index cf4e93801..4186a04e0 100644
--- a/src/wifi/model/wifi-phy-state-helper.cc
+++ b/src/wifi/model/wifi-phy-state-helper.cc
@@ -517,6 +517,7 @@ WifiPhyStateHelper::SwitchMaybeToCcaBusy (Time duration)
     {
       m_startCcaBusy = now;
     }
+  m_stateLogger (now, duration, WifiPhyState::CCA_BUSY);
   m_endCcaBusy = std::max (m_endCcaBusy, now + duration);
 }
 
diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc
index 79f9028f3..d88312e42 100644
--- a/src/wifi/model/wifi-phy.cc
+++ b/src/wifi/model/wifi-phy.cc
@@ -182,15 +182,24 @@ WifiPhy::GetTypeId (void)
     .AddAttribute ("EnergyDetectionThreshold",
                    "The energy of a received signal should be higher than "
                    "this threshold (dbm) to allow the PHY layer to detect the signal.",
-                   DoubleValue (-96.0),
+                   DoubleValue (-101.0),
                    MakeDoubleAccessor (&WifiPhy::SetEdThreshold),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("CcaMode1Threshold",
+                   MakeDoubleChecker<double> (),
+                   TypeId::DEPRECATED, "Replaced by RxSensitivity, this attribute has no effect.")
+    .AddAttribute ("RxSensitivity",
                    "The energy of a received signal should be higher than "
-                   "this threshold (dbm) to allow the PHY layer to declare CCA BUSY state.",
-                   DoubleValue (-99.0),
-                   MakeDoubleAccessor (&WifiPhy::SetCcaMode1Threshold,
-                                       &WifiPhy::GetCcaMode1Threshold),
+                   "this threshold (dBm) for the PHY to detect the signal.",
+                   DoubleValue (-101.0),
+                   MakeDoubleAccessor (&WifiPhy::SetRxSensitivity,
+                                       &WifiPhy::GetRxSensitivity),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("CcaEdThreshold",
+                   "The energy of a non Wi-Fi received signal should be higher than "
+                   "this threshold (dbm) to allow the PHY layer to declare CCA BUSY state. "
+                   "This check is performed on the 20 MHz primary channel only.",
+                   DoubleValue (-62.0),
+                   MakeDoubleAccessor (&WifiPhy::SetCcaEdThreshold,
+                                       &WifiPhy::GetCcaEdThreshold),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("TxGain",
                    "Transmission gain (dB).",
@@ -414,6 +423,12 @@ WifiPhy::DoInitialize (void)
   InitializeFrequencyChannelNumber ();
 }
 
+Ptr<WifiPhyStateHelper>
+WifiPhy::GetState (void) const
+{
+  return m_state;
+}
+
 void
 WifiPhy::SetReceiveOkCallback (RxOkCallback callback)
 {
@@ -475,27 +490,33 @@ WifiPhy::InitializeFrequencyChannelNumber (void)
 void
 WifiPhy::SetEdThreshold (double threshold)
 {
-  NS_LOG_FUNCTION (this << threshold);
-  m_edThresholdW = DbmToW (threshold);
-}
-
-double
-WifiPhy::GetEdThreshold (void) const
-{
-  return WToDbm (m_edThresholdW);
+  SetRxSensitivity (threshold);
 }
 
 void
-WifiPhy::SetCcaMode1Threshold (double threshold)
+WifiPhy::SetRxSensitivity (double threshold)
 {
   NS_LOG_FUNCTION (this << threshold);
-  m_ccaMode1ThresholdW = DbmToW (threshold);
+  m_rxSensitivityW = DbmToW (threshold);
 }
 
 double
-WifiPhy::GetCcaMode1Threshold (void) const
+WifiPhy::GetRxSensitivity (void) const
 {
-  return WToDbm (m_ccaMode1ThresholdW);
+  return WToDbm (m_rxSensitivityW);
+}
+
+void
+WifiPhy::SetCcaEdThreshold (double threshold)
+{
+  NS_LOG_FUNCTION (this << threshold);
+  m_ccaEdThresholdW = DbmToW (threshold);
+}
+
+double
+WifiPhy::GetCcaEdThreshold (void) const
+{
+  return WToDbm (m_ccaEdThresholdW);
 }
 
 void
@@ -1644,7 +1665,7 @@ WifiPhy::ResumeFromSleep (void)
     case WifiPhyState::SLEEP:
       {
         NS_LOG_DEBUG ("resuming from sleep mode");
-        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaMode1ThresholdW);
+        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaEdThresholdW);
         m_state->SwitchFromSleep (delayUntilCcaEnd);
         break;
       }
@@ -1675,7 +1696,7 @@ WifiPhy::ResumeFromOff (void)
     case WifiPhyState::OFF:
       {
         NS_LOG_DEBUG ("resuming from off mode");
-        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaMode1Threshold ()));
+        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
         m_state->SwitchFromOff (delayUntilCcaEnd);
         break;
       }
@@ -2543,7 +2564,7 @@ WifiPhy::MaybeCcaBusyDuration ()
   //In this model, CCA becomes busy when the aggregation of all signals as
   //tracked by the InterferenceHelper class is higher than the CcaBusyThreshold
 
-  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaMode1Threshold ()));
+  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
   if (!delayUntilCcaEnd.IsZero ())
     {
       m_state->SwitchMaybeToCcaBusy (delayUntilCcaEnd);
@@ -3646,7 +3667,7 @@ WifiPhy::SwitchMaybeToCcaBusy (void)
   //In this model, CCA becomes busy when the aggregation of all signals as
   //tracked by the InterferenceHelper class is higher than the CcaBusyThreshold
 
-  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaMode1Threshold ()));
+  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
   if (!delayUntilCcaEnd.IsZero ())
     {
       NS_LOG_DEBUG ("Calling SwitchMaybeToCcaBusy for " << delayUntilCcaEnd.As (Time::S));
@@ -3676,76 +3697,66 @@ void
 WifiPhy::StartRx (Ptr<Packet> packet, WifiTxVector txVector, MpduType mpdutype, double rxPowerW, Time rxDuration, Ptr<Event> event)
 {
   NS_LOG_FUNCTION (this << packet << txVector << +mpdutype << rxPowerW << rxDuration);
-  if (rxPowerW > m_edThresholdW) //checked here, no need to check in the payload reception (current implementation assumes constant rx power over the packet duration)
+
+  AmpduTag ampduTag;
+  WifiPreamble preamble = txVector.GetPreambleType ();
+  if (preamble == WIFI_PREAMBLE_NONE && (m_mpdusNum == 0 || m_plcpSuccess == false))
     {
-      AmpduTag ampduTag;
-      WifiPreamble preamble = txVector.GetPreambleType ();
-      if (preamble == WIFI_PREAMBLE_NONE && (m_mpdusNum == 0 || m_plcpSuccess == false))
-        {
-          m_plcpSuccess = false;
-          m_mpdusNum = 0;
-          NS_LOG_DEBUG ("drop packet because no PLCP preamble/header has been received");
-          NotifyRxDrop (packet);
-          MaybeCcaBusyDuration ();
-          return;
-        }
-      else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
-        {
-          //received the first MPDU in an MPDU
-          m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
-          m_rxMpduReferenceNumber++;
-        }
-      else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
-        {
-          //received the other MPDUs that are part of the A-MPDU
-          if (ampduTag.GetRemainingNbOfMpdus () < (m_mpdusNum - 1))
-            {
-              NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetRemainingNbOfMpdus ());
-              m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
-            }
-          else
-            {
-              m_mpdusNum--;
-            }
-        }
-      else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
-        {
-          NS_LOG_DEBUG ("New A-MPDU started while " << m_mpdusNum << " MPDUs from previous are lost");
-          m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
-        }
-      else if (preamble != WIFI_PREAMBLE_NONE && m_mpdusNum > 0 )
-        {
-          NS_LOG_DEBUG ("Didn't receive the last MPDUs from an A-MPDU " << m_mpdusNum);
-          m_mpdusNum = 0;
-        }
-
-      NS_LOG_DEBUG ("sync to signal (power=" << rxPowerW << "W)");
-      m_currentEvent = event;
-      m_state->SwitchToRx (rxDuration);
-      NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
-      NotifyRxBegin (packet);
-      m_interference.NotifyRxStart ();
-
-      if (preamble != WIFI_PREAMBLE_NONE)
-        {
-          NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
-          Time preambleAndHeaderDuration = CalculatePlcpPreambleAndHeaderDuration (txVector);
-          m_endPlcpRxEvent = Simulator::Schedule (preambleAndHeaderDuration, &WifiPhy::StartReceivePacket, this,
-                                                  packet, txVector, mpdutype, event);
-        }
-
-      NS_ASSERT (m_endRxEvent.IsExpired ());
-      m_endRxEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndReceive, this,
-                                          packet, preamble, mpdutype, event);
-    }
-  else
-    {
-      NS_LOG_DEBUG ("drop packet because signal power too Small (" <<
-                    rxPowerW << "<" << m_edThresholdW << ")");
-      NotifyRxDrop (packet);
       m_plcpSuccess = false;
+      m_mpdusNum = 0;
+      NS_LOG_DEBUG ("drop packet because no PLCP preamble/header has been received");
+      NotifyRxDrop (packet);
       MaybeCcaBusyDuration ();
+      return;
     }
+  else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
+    {
+      //received the first MPDU in an MPDU
+      m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
+      m_rxMpduReferenceNumber++;
+    }
+  else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
+    {
+      //received the other MPDUs that are part of the A-MPDU
+      if (ampduTag.GetRemainingNbOfMpdus () < (m_mpdusNum - 1))
+        {
+          NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetRemainingNbOfMpdus ());
+          m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
+        }
+      else
+        {
+          m_mpdusNum--;
+        }
+    }
+  else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
+    {
+      NS_LOG_DEBUG ("New A-MPDU started while " << m_mpdusNum << " MPDUs from previous are lost");
+      m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
+    }
+  else if (preamble != WIFI_PREAMBLE_NONE && m_mpdusNum > 0 )
+    {
+      NS_LOG_DEBUG ("Didn't receive the last MPDUs from an A-MPDU " << m_mpdusNum);
+      m_mpdusNum = 0;
+    }
+
+  NS_LOG_DEBUG ("sync to signal (power=" << rxPowerW << "W)");
+  m_currentEvent = event;
+  m_state->SwitchToRx (rxDuration);
+  NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
+  NotifyRxBegin (packet);
+  m_interference.NotifyRxStart ();
+
+  if (preamble != WIFI_PREAMBLE_NONE)
+    {
+      NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
+      Time preambleAndHeaderDuration = CalculatePlcpPreambleAndHeaderDuration (txVector);
+      m_endPlcpRxEvent = Simulator::Schedule (preambleAndHeaderDuration, &WifiPhy::StartReceivePacket, this,
+                                              packet, txVector, mpdutype, event);
+    }
+
+  NS_ASSERT (m_endRxEvent.IsExpired ());
+  m_endRxEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndReceive, this,
+                                      packet, preamble, mpdutype, event);
 }
 
 int64_t
diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h
index 05584b4df..3131e38fd 100644
--- a/src/wifi/model/wifi-phy.h
+++ b/src/wifi/model/wifi-phy.h
@@ -23,6 +23,7 @@
 #define WIFI_PHY_H
 
 #include "ns3/event-id.h"
+#include "ns3/deprecated.h"
 #include "ns3/error-model.h"
 #include "wifi-mpdu-type.h"
 #include "wifi-phy-standard.h"
@@ -73,6 +74,13 @@ public:
 
   WifiPhy ();
   virtual ~WifiPhy ();
+  
+  /**
+   * Return the WifiPhyStateHelper of this PHY
+   *
+   * \return the WifiPhyStateHelper of this PHY
+   */
+  Ptr<WifiPhyStateHelper> GetState (void) const;
 
   /**
    * \param callback the callback to invoke
@@ -1190,14 +1198,24 @@ public:
    * this threshold (dbm) to allow the PHY layer to detect the signal.
    *
    * \param threshold the energy detection threshold in dBm
+   *
+   * \deprecated
    */
   void SetEdThreshold (double threshold);
   /**
-   * Return the energy detection threshold (dBm).
+   * Sets the receive sensitivity threshold (dBm).
+   * The energy of a received signal should be higher than
+   * this threshold to allow the PHY layer to detect the signal.
    *
-   * \return the energy detection threshold in dBm
+   * \param threshold the receive sensitivity threshold in dBm
    */
-  double GetEdThreshold (void) const;
+  void SetRxSensitivity (double threshold);
+  /**
+   * Return the receive sensitivity threshold (dBm).
+   *
+   * \return the receive sensitivity threshold in dBm
+   */
+  double GetRxSensitivity (void) const;
   /**
    * Sets the CCA threshold (dBm). The energy of a received signal
    * should be higher than this threshold to allow the PHY
@@ -1205,13 +1223,13 @@ public:
    *
    * \param threshold the CCA threshold in dBm
    */
-  void SetCcaMode1Threshold (double threshold);
+  void SetCcaEdThreshold (double threshold);
   /**
    * Return the CCA threshold (dBm).
    *
    * \return the CCA threshold in dBm
    */
-  double GetCcaMode1Threshold (void) const;
+  double GetCcaEdThreshold (void) const;
   /**
    * Sets the RX loss (dB) in the Signal-to-Noise-Ratio due to non-idealities in the receiver.
    *
@@ -1493,7 +1511,7 @@ protected:
    * Check if Phy state should move to CCA busy state based on current
    * state of interference tracker.  In this model, CCA becomes busy when
    * the aggregation of all signals as tracked by the InterferenceHelper
-   * class is higher than the CcaMode1Threshold
+   * class is higher than the CcaEdThreshold
    */
   void SwitchMaybeToCcaBusy (void);
 
@@ -1755,8 +1773,8 @@ private:
   bool m_frequencyChannelNumberInitialized; //!< Store initialization state
   uint16_t m_channelWidth;                  //!< Channel width
 
-  double   m_edThresholdW;        //!< Energy detection threshold in watts
-  double   m_ccaMode1ThresholdW;  //!< Clear channel assessment (CCA) threshold in watts
+  double   m_rxSensitivityW;      //!< Receive sensitivity threshold in watts
+  double   m_ccaEdThresholdW;     //!< Clear channel assessment (CCA) threshold in watts
   double   m_txGainDb;            //!< Transmission gain (dB)
   double   m_rxGainDb;            //!< Reception gain (dB)
   double   m_txPowerBaseDbm;      //!< Minimum transmission power (dBm)
diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc
index 95607e259..c967c22ae 100644
--- a/src/wifi/model/yans-wifi-channel.cc
+++ b/src/wifi/model/yans-wifi-channel.cc
@@ -125,6 +125,13 @@ void
 YansWifiChannel::Receive (Ptr<YansWifiPhy> phy, Ptr<Packet> packet, double rxPowerDbm, Time duration)
 {
   NS_LOG_FUNCTION (phy << packet << rxPowerDbm << duration.GetSeconds ());
+  // Do no further processing if signal is too weak
+  // Current implementation assumes constant rx power over the packet duration
+  if ((rxPowerDbm + phy->GetRxGain ()) < phy->GetRxSensitivity ())
+    {
+      NS_LOG_INFO ("Received signal too weak to process: " << rxPowerDbm << " dBm");
+      return;
+    }
   phy->StartReceivePreambleAndHeader (packet, DbmToW (rxPowerDbm + phy->GetRxGain ()), duration);
 }
 
diff --git a/src/wifi/test/spectrum-wifi-phy-test.cc b/src/wifi/test/spectrum-wifi-phy-test.cc
index edb96d4ab..f0f0a3f64 100644
--- a/src/wifi/test/spectrum-wifi-phy-test.cc
+++ b/src/wifi/test/spectrum-wifi-phy-test.cc
@@ -167,8 +167,6 @@ SpectrumWifiPhyBasicTest::DoSetup (void)
   m_phy->SetFrequency (FREQUENCY);
   m_phy->SetReceiveOkCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxSuccess, this));
   m_phy->SetReceiveErrorCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxFailure, this));
-  //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum
-  m_phy->SetCcaMode1Threshold (-62.0);
 }
 
 // Test that the expected number of packet receptions occur.
diff --git a/src/wifi/test/wifi-phy-thresholds-test.cc b/src/wifi/test/wifi-phy-thresholds-test.cc
new file mode 100644
index 000000000..58f0484a2
--- /dev/null
+++ b/src/wifi/test/wifi-phy-thresholds-test.cc
@@ -0,0 +1,425 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2018
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
+ */
+
+#include "ns3/log.h"
+#include "ns3/test.h"
+#include "ns3/spectrum-wifi-helper.h"
+#include "ns3/wifi-spectrum-value-helper.h"
+#include "ns3/spectrum-wifi-phy.h"
+#include "ns3/nist-error-rate-model.h"
+#include "ns3/wifi-mac-header.h"
+#include "ns3/wifi-mac-trailer.h"
+#include "ns3/wifi-phy-tag.h"
+#include "ns3/wifi-spectrum-signal-parameters.h"
+#include "ns3/wifi-utils.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("WifiPhyThresholdsTest");
+
+static const uint8_t CHANNEL_NUMBER = 36;
+static const uint32_t FREQUENCY = 5180; //MHz
+static const uint16_t CHANNEL_WIDTH = 20; //MHz
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Threshold Test base class
+ */
+class WifiPhyThresholdsTest : public TestCase
+{
+public:
+  WifiPhyThresholdsTest (std::string test_name);
+  virtual ~WifiPhyThresholdsTest ();
+
+protected:
+  /**
+   * Make wifi signal function
+   * \param txPowerWatts the transmit power in watts
+   * \returns Ptr<SpectrumSignalParameters>
+   */
+  virtual Ptr<SpectrumSignalParameters> MakeWifiSignal (double txPowerWatts);
+  /**
+   * Make foreign signal function
+   * \param txPowerWatts the transmit power in watts
+   * \returns Ptr<SpectrumSignalParameters>
+   */
+  virtual Ptr<SpectrumSignalParameters> MakeForeignSignal (double txPowerWatts);
+  /**
+   * Send signal function
+   * \param txPowerWatts the transmit power in watts
+   * \param wifiSignal whether the signal is a wifi signal or not
+   */
+  virtual void SendSignal (double txPowerWatts, bool wifiSignal);
+  /**
+   * PHY receive success callback function
+   * \param p the packet
+   * \param snr the SNR
+   * \param txVector the transmit vector
+   */
+  virtual void RxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector);
+  /**
+   * PHY receive failure callback function
+   */
+  virtual void RxFailure (void);
+  /**
+   * PHY dropped packet callback function
+   * \param p the packet
+   */
+  virtual void RxDropped (Ptr<const Packet> p);
+  /**
+   * PHY state changed callback function
+   * \param start the start time of the new state
+   * \param duration the duration of the new state
+   * \param newState the new state
+   */
+  virtual void PhyStateChanged (Time start, Time duration, WifiPhyState newState);
+
+  Ptr<SpectrumWifiPhy> m_phy; ///< PHY object
+  uint32_t m_rxSuccess;       ///< count number of successfully received packets
+  uint32_t m_rxFailure;       ///< count number of unsuccessfully received packets
+  uint32_t m_rxDropped;       ///< count number of dropped packets
+  uint32_t m_stateChanged;    ///< count number of PHY state change
+  uint32_t m_rxStateCount;    ///< count number of PHY state change to RX state
+  uint32_t m_idleStateCount;    ///< count number of PHY state change to IDLE state
+  uint32_t m_ccabusyStateCount; ///< count number of PHY state change to CCA_BUSY state
+
+private:
+  virtual void DoSetup (void);
+};
+
+WifiPhyThresholdsTest::WifiPhyThresholdsTest (std::string test_name)
+  : TestCase (test_name),
+    m_rxSuccess (0),
+    m_rxFailure (0),
+    m_rxDropped (0),
+    m_stateChanged (0),
+    m_rxStateCount (0),
+    m_idleStateCount (0),
+    m_ccabusyStateCount (0)
+{
+}
+
+WifiPhyThresholdsTest::~WifiPhyThresholdsTest ()
+{
+}
+
+Ptr<SpectrumSignalParameters>
+WifiPhyThresholdsTest::MakeWifiSignal (double txPowerWatts)
+{
+  WifiTxVector txVector = WifiTxVector (WifiPhy::GetOfdmRate6Mbps (), 0, WIFI_PREAMBLE_LONG, false, 1, 1, 0, 20, false, false);
+  MpduType mpdutype = NORMAL_MPDU;
+
+  Ptr<Packet> pkt = Create<Packet> (1000);
+  WifiMacHeader hdr;
+  WifiMacTrailer trailer;
+
+  hdr.SetType (WIFI_MAC_QOSDATA);
+  hdr.SetQosTid (0);
+  uint32_t size = pkt->GetSize () + hdr.GetSize () + trailer.GetSerializedSize ();
+  Time txDuration = m_phy->CalculateTxDuration (size, txVector, m_phy->GetFrequency (), mpdutype, 0);
+  hdr.SetDuration (txDuration);
+
+  pkt->AddHeader (hdr);
+  pkt->AddTrailer (trailer);
+  WifiPhyTag tag (txVector, mpdutype, 1);
+  pkt->AddPacketTag (tag);
+  Ptr<SpectrumValue> txPowerSpectrum = WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity (FREQUENCY, CHANNEL_WIDTH, txPowerWatts, CHANNEL_WIDTH);
+  Ptr<WifiSpectrumSignalParameters> txParams = Create<WifiSpectrumSignalParameters> ();
+  txParams->psd = txPowerSpectrum;
+  txParams->txPhy = 0;
+  txParams->duration = txDuration;
+  txParams->packet = pkt;
+  return txParams;
+}
+
+Ptr<SpectrumSignalParameters>
+WifiPhyThresholdsTest::MakeForeignSignal (double txPowerWatts)
+{
+  Ptr<SpectrumValue> txPowerSpectrum = WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity (FREQUENCY, CHANNEL_WIDTH, txPowerWatts, CHANNEL_WIDTH);
+  Ptr<SpectrumSignalParameters> txParams = Create<SpectrumSignalParameters> ();
+  txParams->psd = txPowerSpectrum;
+  txParams->txPhy = 0;
+  txParams->duration = Seconds (0.5);
+  return txParams;
+}
+
+void
+WifiPhyThresholdsTest::SendSignal (double txPowerWatts, bool wifiSignal)
+{
+  if (wifiSignal)
+    {
+      m_phy->StartRx (MakeWifiSignal (txPowerWatts));
+    }
+  else
+    {
+      m_phy->StartRx (MakeForeignSignal (txPowerWatts));
+    }
+}
+
+void
+WifiPhyThresholdsTest::RxSuccess (Ptr<Packet> p, double snr, WifiTxVector txVector)
+{
+  NS_LOG_FUNCTION (this << p << snr << txVector);
+  m_rxSuccess++;
+}
+
+void
+WifiPhyThresholdsTest::RxFailure (void)
+{
+  NS_LOG_FUNCTION (this);
+  m_rxFailure++;
+}
+
+void
+WifiPhyThresholdsTest::RxDropped (Ptr<const Packet> p)
+{
+  NS_LOG_FUNCTION (this << p);
+  m_rxDropped++;
+}
+
+void
+WifiPhyThresholdsTest::PhyStateChanged (Time start, Time duration, WifiPhyState newState)
+{
+  NS_LOG_FUNCTION (this << start << duration << newState);
+  m_stateChanged++;
+  if (newState == WifiPhyState::IDLE)
+    {
+      m_idleStateCount++;
+    }
+  else if (newState == WifiPhyState::RX)
+    {
+      m_rxStateCount++;
+    }
+  else if (newState == WifiPhyState::CCA_BUSY)
+    {
+      m_ccabusyStateCount++;
+    }
+}
+
+void
+WifiPhyThresholdsTest::DoSetup (void)
+{
+  m_phy = CreateObject<SpectrumWifiPhy> ();
+  m_phy->ConfigureStandard (WIFI_PHY_STANDARD_80211ax_5GHZ);
+  Ptr<ErrorRateModel> error = CreateObject<NistErrorRateModel> ();
+  m_phy->SetErrorRateModel (error);
+  m_phy->SetChannelNumber (CHANNEL_NUMBER);
+  m_phy->SetFrequency (FREQUENCY);
+  m_phy->SetReceiveOkCallback (MakeCallback (&WifiPhyThresholdsTest::RxSuccess, this));
+  m_phy->SetReceiveErrorCallback (MakeCallback (&WifiPhyThresholdsTest::RxFailure, this));
+  m_phy->TraceConnectWithoutContext ("PhyRxDrop", MakeCallback (&WifiPhyThresholdsTest::RxDropped, this));
+  m_phy->GetState ()->TraceConnectWithoutContext ("State", MakeCallback (&WifiPhyThresholdsTest::PhyStateChanged, this));
+}
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Threshold Weak Wifi Signal Test
+ *
+ * This test makes sure PHY ignores a Wi-Fi signal
+ * if its received power lower than RxSensitivity.
+ */
+class WifiPhyThresholdsWeakWifiSignalTest : public WifiPhyThresholdsTest
+{
+public:
+  WifiPhyThresholdsWeakWifiSignalTest ();
+  virtual ~WifiPhyThresholdsWeakWifiSignalTest ();
+  virtual void DoRun (void);
+};
+
+WifiPhyThresholdsWeakWifiSignalTest::WifiPhyThresholdsWeakWifiSignalTest ()
+  : WifiPhyThresholdsTest ("WifiPhy reception thresholds: test weak wifi signal reception")
+{
+}
+
+WifiPhyThresholdsWeakWifiSignalTest::~WifiPhyThresholdsWeakWifiSignalTest ()
+{
+}
+
+void
+WifiPhyThresholdsWeakWifiSignalTest::DoRun (void)
+{
+  WifiHelper::EnableLogComponents ();
+
+  double txPowerWatts = DbmToW (-110);
+
+  Simulator::Schedule (Seconds (1), &WifiPhyThresholdsWeakWifiSignalTest::SendSignal, this, txPowerWatts, true);
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  NS_TEST_ASSERT_MSG_EQ (m_rxDropped + m_rxSuccess + m_rxFailure, 0, "Reception should not have been triggered if packet is weaker than RxSensitivity threshold");
+  NS_TEST_ASSERT_MSG_EQ (m_stateChanged, 0, "State should stay idle if reception involves a signal weaker than RxSensitivity threshold");
+}
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Threshold Weak Foreign Signal Test
+ *
+ * This test makes sure PHY keeps the state as IDLE if reception involves
+ * a foreign signal with a received power lower than CcaEdThreshold.
+ */
+class WifiPhyThresholdsWeakForeignSignalTest : public WifiPhyThresholdsTest
+{
+public:
+  WifiPhyThresholdsWeakForeignSignalTest ();
+  virtual ~WifiPhyThresholdsWeakForeignSignalTest ();
+  virtual void DoRun (void);
+};
+
+WifiPhyThresholdsWeakForeignSignalTest::WifiPhyThresholdsWeakForeignSignalTest ()
+  : WifiPhyThresholdsTest ("WifiPhy reception thresholds: test weak foreign signal reception")
+{
+}
+
+WifiPhyThresholdsWeakForeignSignalTest::~WifiPhyThresholdsWeakForeignSignalTest ()
+{
+}
+
+void
+WifiPhyThresholdsWeakForeignSignalTest::DoRun (void)
+{
+  WifiHelper::EnableLogComponents ();
+
+  double txPowerWatts = DbmToW (-90);
+
+  Simulator::Schedule (Seconds (1), &WifiPhyThresholdsWeakForeignSignalTest::SendSignal, this, txPowerWatts, false);
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  NS_TEST_ASSERT_MSG_EQ (m_rxDropped + m_rxSuccess + m_rxFailure, 0, "Reception of non-wifi packet should not be triggered");
+  NS_TEST_ASSERT_MSG_EQ (m_stateChanged, 0, "State should stay idle if reception involves a signal weaker than RxSensitivity threshold");
+}
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Threshold Strong Wifi Signal Test
+ *
+ * This test makes sure PHY processes a Wi-Fi signal
+ * with a received power higher than RxSensitivity.
+ */
+class WifiPhyThresholdsStrongWifiSignalTest : public WifiPhyThresholdsTest
+{
+public:
+  WifiPhyThresholdsStrongWifiSignalTest ();
+  virtual ~WifiPhyThresholdsStrongWifiSignalTest ();
+  virtual void DoRun (void);
+};
+
+WifiPhyThresholdsStrongWifiSignalTest::WifiPhyThresholdsStrongWifiSignalTest ()
+  : WifiPhyThresholdsTest ("WifiPhy reception thresholds: test strong wifi signal reception")
+{
+}
+
+WifiPhyThresholdsStrongWifiSignalTest::~WifiPhyThresholdsStrongWifiSignalTest ()
+{
+}
+
+void
+WifiPhyThresholdsStrongWifiSignalTest::DoRun (void)
+{
+  WifiHelper::EnableLogComponents ();
+
+  double txPowerWatts = DbmToW (-60);
+
+  Simulator::Schedule (Seconds (1), &WifiPhyThresholdsStrongWifiSignalTest::SendSignal, this, txPowerWatts, true);
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  NS_TEST_ASSERT_MSG_EQ (m_rxDropped + m_rxFailure, 0, "Packet reception should have been successfull");
+  NS_TEST_ASSERT_MSG_EQ (m_rxSuccess, 1, "Packet should have been successfully received");
+  NS_TEST_ASSERT_MSG_EQ (m_stateChanged, 2, "State should have moved to RX then back to IDLE");
+  NS_TEST_ASSERT_MSG_EQ (m_rxStateCount, 1, "State should have moved to RX once");
+  NS_TEST_ASSERT_MSG_EQ (m_idleStateCount, 1, "State should have moved to IDLE once");
+}
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Threshold Strong Foreign Signal Test
+ *
+ * This test makes sure PHY declare the state as CCA_BUSY if reception involves
+ * a foreign signal with a received power higher than CcaEdThreshold.
+ */
+class WifiPhyThresholdsStrongForeignSignalTest : public WifiPhyThresholdsTest
+{
+public:
+  WifiPhyThresholdsStrongForeignSignalTest ();
+  virtual ~WifiPhyThresholdsStrongForeignSignalTest ();
+  virtual void DoRun (void);
+};
+
+WifiPhyThresholdsStrongForeignSignalTest::WifiPhyThresholdsStrongForeignSignalTest ()
+  : WifiPhyThresholdsTest ("WifiPhy reception thresholds: test weak foreign signal reception")
+{
+}
+
+WifiPhyThresholdsStrongForeignSignalTest::~WifiPhyThresholdsStrongForeignSignalTest ()
+{
+}
+
+void
+WifiPhyThresholdsStrongForeignSignalTest::DoRun (void)
+{
+  WifiHelper::EnableLogComponents ();
+
+  double txPowerWatts = DbmToW (-60);
+
+  Simulator::Schedule (Seconds (1), &WifiPhyThresholdsStrongForeignSignalTest::SendSignal, this, txPowerWatts, false);
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  NS_TEST_ASSERT_MSG_EQ (m_rxDropped + m_rxSuccess + m_rxFailure, 0, "Reception of non-wifi packet should not be triggered");
+  NS_TEST_ASSERT_MSG_EQ (m_ccabusyStateCount, 1, "State should have moved to CCA-BUSY");
+}
+
+/**
+ * \ingroup wifi-test
+ * \ingroup tests
+ *
+ * \brief Wifi Phy Thresholds Test Suite
+ */
+class WifiPhyThresholdsTestSuite : public TestSuite
+{
+public:
+  WifiPhyThresholdsTestSuite ();
+};
+
+WifiPhyThresholdsTestSuite::WifiPhyThresholdsTestSuite ()
+  : TestSuite ("wifi-phy-thresholds", UNIT)
+{
+  AddTestCase (new WifiPhyThresholdsWeakWifiSignalTest, TestCase::QUICK);
+  AddTestCase (new WifiPhyThresholdsWeakForeignSignalTest, TestCase::QUICK);
+  AddTestCase (new WifiPhyThresholdsStrongWifiSignalTest, TestCase::QUICK);
+  AddTestCase (new WifiPhyThresholdsStrongForeignSignalTest, TestCase::QUICK);
+}
+
+static WifiPhyThresholdsTestSuite wifiPhyThresholdsTestSuite; ///< the test suite
diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc
index 614fe9606..7b5428997 100644
--- a/src/wifi/test/wifi-test.cc
+++ b/src/wifi/test/wifi-test.cc
@@ -1290,7 +1290,6 @@ Bug2483TestCase::DoRun (void)
   spectrumPhy.Set ("ChannelWidth", UintegerValue (channelWidth));
   spectrumPhy.Set ("TxPowerStart", DoubleValue (10));
   spectrumPhy.Set ("TxPowerEnd", DoubleValue (10));
-  spectrumPhy.Set ("CcaMode1Threshold", DoubleValue (-62.0));
 
   WifiHelper wifi;
   wifi.SetStandard (WIFI_PHY_STANDARD_80211ac);
diff --git a/src/wifi/wscript b/src/wifi/wscript
index d06c3cf94..d1b3e3767 100644
--- a/src/wifi/wscript
+++ b/src/wifi/wscript
@@ -111,6 +111,7 @@ def build(bld):
         'test/wifi-aggregation-test.cc',
         'test/wifi-error-rate-models-test.cc',
         'test/wifi-transmit-mask-test.cc',
+        'test/wifi-phy-thresholds-test.cc',
         ]
 
     headers = bld(features='ns3header')