branch merge

src/core/wscript

@@ -151,4 +151,5 @@ def build(bld):
                 ])
 
     if bld.env['ENABLE_GSL']:
+        core.uselib = 'GSL GSLCBLAS M'
         core.source.extend(['rng-test-suite.cc'])

src/devices/wifi/interference-helper.cc

@@ -460,7 +460,11 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<InterferenceHelper::Event>
           i++;
           continue;
         }
-      if (event->Overlaps ((*i)->GetStartTime ())) 
+      if ((*i)->Overlaps (event->GetStartTime ())) 
+        {
+          noiseInterference += (*i)->GetRxPowerW ();
+        }
+      else if (event->Overlaps ((*i)->GetStartTime ())) 
         {
           ni->push_back (NiChange ((*i)->GetStartTime (), (*i)->GetRxPowerW ()));
         }
@@ -468,10 +472,6 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<InterferenceHelper::Event>
         {
           ni->push_back (NiChange ((*i)->GetEndTime (), -(*i)->GetRxPowerW ()));
         }
-      if ((*i)->Overlaps (event->GetStartTime ())) 
-        {
-          noiseInterference += (*i)->GetRxPowerW ();
-        }
       i++;
     }
   ni->push_back (NiChange (event->GetStartTime (), noiseInterference));

src/devices/wifi/minstrel-wifi-manager.cc

@@ -369,7 +369,6 @@ MinstrelWifiRemoteStation::GetManager (void) const
 WifiMode
 MinstrelWifiRemoteStation::DoGetDataMode (uint32_t size)
 {
-  UpdateStats ();
   if (!m_initialized)
     {
       CheckInit ();
@@ -377,6 +376,7 @@ MinstrelWifiRemoteStation::DoGetDataMode (uint32_t size)
       /// start the rate at half way
       m_txrate = GetNSupportedModes () / 2;
     }
+  UpdateStats ();
   return GetSupportedMode (m_txrate);
 }
 
@@ -435,7 +435,7 @@ MinstrelWifiRemoteStation::FindRate ()
     {
 
       /// now go through the table and find an index rate
-      idx = GetNextSample	();
+      idx = GetNextSample();
 			
 			
       /**

src/internet-stack/wscript

@@ -8,7 +8,7 @@ import Utils
 import Task
 
 # Required NSC version
-NSC_RELEASE_NAME = "nsc-0.5.0"
+NSC_RELEASE_NAME = "nsc-0.5.1"
 
 
 def set_options(opt):