From d9f4c3072051e5d248ff3244aaebfb2f3851e39a Mon Sep 17 00:00:00 2001
From: Duy Nguyen <duy@soe.ucsc.edu>
Date: Mon, 21 Sep 2009 23:44:59 -0700
Subject: [PATCH 1/4] Fixed Minstrel rate potential seg fault due to calling
 UpdateStats before being initialized

---
 src/devices/wifi/minstrel-wifi-manager.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devices/wifi/minstrel-wifi-manager.cc b/src/devices/wifi/minstrel-wifi-manager.cc
index 304a62a3a..944f9fd97 100644
--- a/src/devices/wifi/minstrel-wifi-manager.cc
+++ b/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();
 			
 			
       /**

From 904a2b4410002ea99b08a90776b219f05bfeb9fd Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Tue, 22 Sep 2009 17:33:03 +0200
Subject: [PATCH 2/4] bug 643: Interference Helper does not account properly
 for simultaneous events

---
 src/devices/wifi/interference-helper.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/interference-helper.cc
index 4e0301ba0..1a41e588b 100644
--- a/src/devices/wifi/interference-helper.cc
+++ b/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));

From a0dbfe494e49da2fcf3da373a0d77e704de92472 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Wed, 23 Sep 2009 08:57:40 +0200
Subject: [PATCH 3/4] bump up nsc version requirement

---
 src/internet-stack/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript
index b46151590..ba5c1d8d8 100644
--- a/src/internet-stack/wscript
+++ b/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):

From 912e6dc45aba4f220c9770dbc0e36a1e15a7a2b7 Mon Sep 17 00:00:00 2001
From: Aleksey Kovalenko <kovalenko@iitp.ru>
Date: Wed, 23 Sep 2009 20:48:43 +0400
Subject: [PATCH 4/4] bug 687: Build failed with GSL in non-default location

---
 src/core/wscript | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/wscript b/src/core/wscript
index 566e8b4f6..789b063ef 100644
--- a/src/core/wscript
+++ b/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'])