--- a/src/devices/wifi/aarf-mac-stations.cc	Mon Oct 08 17:02:20 2007 +0200
+++ b/src/devices/wifi/aarf-mac-stations.cc	Mon Oct 08 17:04:34 2007 +0200
@@ -1,7 +1,6 @@
 /* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2004,2005,2006 INRIA
- * All rights reserved.
  *
  * 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 
@@ -26,25 +25,25 @@
 
 namespace ns3 {
 
-AarfMacStations::AarfMacStations (uint8_t nMode)
-  : ArfMacStations (nMode)
+AarfMacStations::AarfMacStations (WifiMode defaultTxMode)
+  : ArfMacStations (defaultTxMode)
 {}
 AarfMacStations::~AarfMacStations ()
 {}
 MacStation *
-AarfMacStations::CreateStation (void)
+AarfMacStations::CreateStation (WifiMode defaultTxMode)
 {
-  return new AarfMacStation (this, 2.0, 60, 2.0);
+  return new AarfMacStation (defaultTxMode, 2.0, 60, 2.0);
 }
 
 
 
 
-AarfMacStation::AarfMacStation (AarfMacStations *stations,   
+AarfMacStation::AarfMacStation (WifiMode defaultTxMode,
                                 double successK,
                                 int maxSuccessThreshold,
                                 double timerK)
-  : ArfMacStation (stations, 15, 10),
+  : ArfMacStation (defaultTxMode, 15, 10),
     m_successK (successK),
     m_maxSuccessThreshold (maxSuccessThreshold),
     m_timerK (timerK)
@@ -70,4 +69,4 @@
   SetSuccessThreshold (GetMinSuccessThreshold ());
 }
 
-}; // namespace ns3
+} // namespace ns3

--- a/src/devices/wifi/aarf-mac-stations.h	Mon Oct 08 17:02:20 2007 +0200
+++ b/src/devices/wifi/aarf-mac-stations.h	Mon Oct 08 17:04:34 2007 +0200
@@ -1,7 +1,6 @@
 /* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005,2006 INRIA
- * All rights reserved.
  *
  * 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 
@@ -27,16 +26,16 @@
 
 class AarfMacStations : public ArfMacStations {
 public:
-  AarfMacStations (uint8_t nModes);
+  AarfMacStations (WifiMode defaultTxMode);
   virtual ~AarfMacStations ();
 private:
-  virtual class MacStation *CreateStation (void);
+  virtual class MacStation *CreateStation (WifiMode defaultTxMode);
 };
 
 class AarfMacStation : public ArfMacStation
 {
 public:
-  AarfMacStation (AarfMacStations *stations,
+  AarfMacStation (WifiMode defaultTxMode,
                   double successK,
                   int maxSuccessThreshold,
                   double timerK);
@@ -51,7 +50,7 @@
   double m_timerK;
 };
 
-}; // namespace ns3
+} // namespace ns3
 
 
 #endif /* AARF_MAC_STATIONS_H */

--- a/src/devices/wifi/wscript	Mon Oct 08 17:02:20 2007 +0200
+++ b/src/devices/wifi/wscript	Mon Oct 08 17:04:34 2007 +0200
@@ -12,6 +12,7 @@
         'mac-stations.cc',
         'cr-mac-stations.cc',
         'arf-mac-stations.cc',
+        'aarf-mac-stations.cc',
         'wifi-mac-header.cc',
         'wifi-mac-trailer.cc',
         'mac-parameters.cc',