--- a/CHANGES.html	Mon Jul 19 17:39:51 2010 -0400
+++ b/CHANGES.html	Tue Jul 20 07:34:14 2010 -0700
@@ -112,6 +112,12 @@
 
 <li><b>Drop trace logged for Ipv4/6 forwarding failure:</b> Fixed bug 861; this 
 will add ascii traces (drops) in Ipv4 and Ipv6 traces for forwarding failures
+
+<li><b>Changed default WiFi error rate model for OFDM modulation types:</b> 
+Adopted more conservative ErrorRateModel for OFDM modulation types (a/g).
+This will require 4 to 5 more dB of received power to get similar results
+as before, so users may observe a reduced WiFi range when using the defaults.
+See tracker issie 944 for more details.
 </ul>
 
 <hr>

--- a/RELEASE_NOTES	Mon Jul 19 17:39:51 2010 -0400
+++ b/RELEASE_NOTES	Tue Jul 20 07:34:14 2010 -0700
@@ -40,7 +40,8 @@
    - A new OFDM error rate model for WiFi (NistErrorRateModel); this model
      has been validated in clear-channel testbed tests.  For 802.11b, it
      uses the same underlying model as the YansErrorRateModel, but it differs
-     from YansErrorRateModel for OFDM modes (802.11a/g).
+     from YansErrorRateModel for OFDM modes (802.11a/g).  The default
+     YansWifiPhyHelper has been changed to use this model.
 
    - A brand new NS-2 mobility trace reader supports BonnMotion, SUMO, TraNS, 
      etc. traces.

--- a/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -106,6 +106,8 @@
 {
   // 1. setup WiFi
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  // This test suite output was originally based on YansErrorRateModel     
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");   
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
   // 2. setup mesh

--- a/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -103,6 +103,8 @@
 {
   // 1. setup WiFi
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  // This test suite output was originally based on YansErrorRateModel     
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");   
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
   // 2. setup mesh

--- a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -122,6 +122,8 @@
 {
   // 1. setup WiFi
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  // This test suite output was originally based on YansErrorRateModel     
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");   
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
   // 2. setup mesh

--- a/src/devices/mesh/flame/test/flame-regression.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/devices/mesh/flame/test/flame-regression.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -93,6 +93,8 @@
 {
   // 1. setup WiFi
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  // This test suite output was originally based on YansErrorRateModel   
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); 
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
   // 2. setup mesh

--- a/src/helper/yans-wifi-helper.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/helper/yans-wifi-helper.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -183,7 +183,7 @@
 YansWifiPhyHelper::Default (void)
 {
   YansWifiPhyHelper helper;
-  helper.SetErrorRateModel ("ns3::YansErrorRateModel");
+  helper.SetErrorRateModel ("ns3::NistErrorRateModel");
   return helper;
 }
 

--- a/src/routing/aodv/test/aodv-regression.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/routing/aodv/test/aodv-regression.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -139,6 +139,8 @@
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
+  // This test suite output was originally based on YansErrorRateModel   
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); 
   WifiHelper wifi = WifiHelper::Default ();
   wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));
   NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); 

--- a/src/routing/aodv/test/bug-772.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/routing/aodv/test/bug-772.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -112,6 +112,8 @@
   NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
   wifiMac.SetType ("ns3::AdhocWifiMac");
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+  // This test suite output was originally based on YansErrorRateModel     
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");   
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
   WifiHelper wifi = WifiHelper::Default ();

--- a/src/routing/olsr/test/tc-regression-test.cc	Mon Jul 19 17:39:51 2010 -0400
+++ b/src/routing/olsr/test/tc-regression-test.cc	Tue Jul 20 07:34:14 2010 -0700
@@ -100,6 +100,8 @@
   YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
   YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
   wifiPhy.SetChannel (wifiChannel.Create ());
+  // This test suite output was originally based on YansErrorRateModel 
+  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
   WifiHelper wifi = WifiHelper::Default ();
   wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
   wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));