--- a/src/devices/wifi/adhoc-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/adhoc-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -87,8 +87,8 @@
   AdhocWifiMac (const AdhocWifiMac & ctor_arg);
   AdhocWifiMac &operator = (const AdhocWifiMac &o);
   Ptr<DcaTxop> GetDcaTxop(void) const;
-  void TxOk (WifiMacHeader const &hdr);
-  void TxFailed (WifiMacHeader const &hdr);
+  void TxOk (const WifiMacHeader &hdr);
+  void TxFailed (const WifiMacHeader &hdr);
   virtual void FinishConfigureStandard (enum WifiPhyStandard standard);
   Ptr<DcaTxop> m_dca;
   Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> m_upCallback;
@@ -98,8 +98,8 @@
   MacRxMiddle *m_rxMiddle;
   Ptr<MacLow> m_low;
   Ssid m_ssid;
-  TracedCallback<WifiMacHeader const &> m_txOkCallback;
-  TracedCallback<WifiMacHeader const &> m_txErrCallback;
+  TracedCallback<const WifiMacHeader &> m_txOkCallback;
+  TracedCallback<const WifiMacHeader &> m_txErrCallback;
 };
 
 } // namespace ns3

--- a/src/devices/wifi/edca-txop-n.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/edca-txop-n.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -438,7 +438,7 @@
 }
 
 void
-EdcaTxopN::Queue (Ptr<const Packet> packet, WifiMacHeader const &hdr)
+EdcaTxopN::Queue (Ptr<const Packet> packet, const WifiMacHeader &hdr)
 {
   NS_LOG_FUNCTION (this << packet << &hdr);
   WifiMacTrailer fcs;
@@ -652,7 +652,7 @@
 }
 
 Mac48Address
-EdcaTxopN::MapSrcAddressForAggregation (WifiMacHeader const &hdr)
+EdcaTxopN::MapSrcAddressForAggregation (const WifiMacHeader &hdr)
 {
   Mac48Address retval;
   if (m_typeOfStation == STA || m_typeOfStation == ADHOC_STA)
@@ -667,7 +667,7 @@
 }
 
 Mac48Address
-EdcaTxopN::MapDestAddressForAggregation (WifiMacHeader const &hdr)
+EdcaTxopN::MapDestAddressForAggregation (const WifiMacHeader &hdr)
 {
   Mac48Address retval;
   if (m_typeOfStation == AP || m_typeOfStation == ADHOC_STA)

--- a/src/devices/wifi/edca-txop-n.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/edca-txop-n.h	Mon Nov 30 18:20:30 2009 +0100
@@ -67,8 +67,8 @@
 {
 public:
 
-  typedef Callback <void, WifiMacHeader const&> TxOk;
-  typedef Callback <void, WifiMacHeader const&> TxFailed;
+  typedef Callback <void, const WifiMacHeader&> TxOk;
+  typedef Callback <void, const WifiMacHeader&> TxFailed;
   
   static TypeId GetTypeId (void);
   EdcaTxopN ();
@@ -128,7 +128,7 @@
   void NextFragment (void);
   Ptr<Packet> GetFragmentPacket (WifiMacHeader *hdr);
   
-  void Queue (Ptr<const Packet> packet, WifiMacHeader const &hdr);
+  void Queue (Ptr<const Packet> packet, const WifiMacHeader &hdr);
   void SetMsduAggregator (Ptr<MsduAggregator> aggr);
 
 private:
@@ -141,8 +141,8 @@
    *   SA = Address3
    *   DA = Address1
    */
-  Mac48Address MapSrcAddressForAggregation (WifiMacHeader const &hdr);
-  Mac48Address MapDestAddressForAggregation (WifiMacHeader const &hdr);
+  Mac48Address MapSrcAddressForAggregation (const WifiMacHeader &hdr);
+  Mac48Address MapDestAddressForAggregation (const WifiMacHeader &hdr);
   EdcaTxopN &operator = (const EdcaTxopN &);
   EdcaTxopN (const EdcaTxopN &);
   

--- a/src/devices/wifi/interference-helper.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/interference-helper.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -113,9 +113,9 @@
   return m_delta;
 }
 bool 
-InterferenceHelper::NiChange::operator < (InterferenceHelper::NiChange const &o) const
+InterferenceHelper::NiChange::operator < (const InterferenceHelper::NiChange& o) const
 {
-  return (m_time < o.m_time)?true:false;
+  return (m_time < o.m_time);
 }
 
 /****************************************************************

--- a/src/devices/wifi/interference-helper.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/interference-helper.h	Mon Nov 30 18:20:30 2009 +0100
@@ -102,7 +102,7 @@
     NiChange (Time time, double delta);
     Time GetTime (void) const;
     double GetDelta (void) const;
-    bool operator < (NiChange const &o) const;
+    bool operator < (const NiChange& o) const;
   private:
     Time m_time;
     double m_delta;

--- a/src/devices/wifi/mac-low.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/mac-low.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -174,22 +174,22 @@
 bool 
 MacLowTransmissionParameters::MustWaitAck (void) const
 {
-  return (m_waitAck != ACK_NONE)?true:false;
+  return (m_waitAck != ACK_NONE);
 }
 bool 
 MacLowTransmissionParameters::MustWaitNormalAck (void) const
 {
-  return (m_waitAck == ACK_NORMAL)?true:false;
+  return (m_waitAck == ACK_NORMAL);
 }
 bool 
 MacLowTransmissionParameters::MustWaitFastAck (void) const
 {
-  return (m_waitAck == ACK_FAST)?true:false;
+  return (m_waitAck == ACK_FAST);
 }
 bool 
 MacLowTransmissionParameters::MustWaitSuperFastAck (void) const
 {
-  return (m_waitAck == ACK_SUPER_FAST)?true:false;
+  return (m_waitAck == ACK_SUPER_FAST);
 }
 bool 
 MacLowTransmissionParameters::MustSendRts (void) const
@@ -199,7 +199,7 @@
 bool 
 MacLowTransmissionParameters::HasDurationId (void) const
 {
-  return (m_overrideDurationId != Seconds (0))?true:false;
+  return (m_overrideDurationId != Seconds (0));
 }
 Time
 MacLowTransmissionParameters::GetDurationId (void) const
@@ -210,7 +210,7 @@
 bool 
 MacLowTransmissionParameters::HasNextPacket (void) const
 {
-  return (m_nextSize != 0)?true:false;
+  return (m_nextSize != 0);
 }
 uint32_t 
 MacLowTransmissionParameters::GetNextPacketSize (void) const
@@ -466,7 +466,7 @@
 
 void 
 MacLow::StartTransmission (Ptr<const Packet> packet, 
-                           WifiMacHeader const*hdr, 
+                           const WifiMacHeader* hdr, 
                            MacLowTransmissionParameters params,
                            MacLowTransmissionListener *listener)
 {
@@ -760,8 +760,8 @@
 
 Time
 MacLow::CalculateOverallTxTime (Ptr<const Packet> packet,
-                                WifiMacHeader const*hdr, 
-                                MacLowTransmissionParameters const& params) const
+                                const WifiMacHeader* hdr, 
+                                const MacLowTransmissionParameters& params) const
 {
   Time txTime = Seconds (0);
   WifiMode rtsMode = GetRtsTxMode (packet, hdr);
@@ -784,8 +784,8 @@
 
 Time
 MacLow::CalculateTransmissionTime (Ptr<const Packet> packet,
-                                   WifiMacHeader const*hdr, 
-                                   MacLowTransmissionParameters const& params) const
+                                   const WifiMacHeader* hdr, 
+                                   const MacLowTransmissionParameters& params) const
 {
   Time txTime = CalculateOverallTxTime (packet, hdr, params);
   if (params.HasNextPacket ()) 
@@ -908,7 +908,7 @@
 }
 
 void
-MacLow::ForwardDown (Ptr<const Packet> packet, WifiMacHeader const* hdr, 
+MacLow::ForwardDown (Ptr<const Packet> packet, const WifiMacHeader* hdr, 
                      WifiMode txMode)
 {
   NS_LOG_FUNCTION (this << packet << hdr << txMode);

--- a/src/devices/wifi/mac-low.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/mac-low.h	Mon Nov 30 18:20:30 2009 +0100
@@ -276,7 +276,7 @@
  */
 class MacLow : public Object {
 public:
-  typedef Callback<void, Ptr<Packet> , WifiMacHeader const*> MacLowRxCallback;
+  typedef Callback<void, Ptr<Packet>, const WifiMacHeader*> MacLowRxCallback;
 
   MacLow ();
   virtual ~MacLow ();
@@ -321,8 +321,8 @@
    * the next packet transmission if one was selected.
    */
   Time CalculateTransmissionTime (Ptr<const Packet> packet,
-                                  WifiMacHeader const*hdr, 
-                                  MacLowTransmissionParameters const&parameters) const;
+                                  const WifiMacHeader* hdr, 
+                                  const MacLowTransmissionParameters& parameters) const;
 
   /**
    * \param packet packet to send
@@ -334,7 +334,7 @@
    * of transmission events.
    */
   void StartTransmission (Ptr<const Packet> packet, 
-                          WifiMacHeader const*hdr, 
+                          const WifiMacHeader* hdr, 
                           MacLowTransmissionParameters parameters,
                           MacLowTransmissionListener *listener);
 
@@ -372,11 +372,11 @@
   uint32_t GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
   Time NowUs (void) const;
   WifiRemoteStation *GetStation (Mac48Address to) const;
-  void ForwardDown (Ptr<const Packet> packet, WifiMacHeader const *hdr, 
+  void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr, 
                     WifiMode txMode);
   Time CalculateOverallTxTime (Ptr<const Packet> packet,
-                               WifiMacHeader const*hdr, 
-                               MacLowTransmissionParameters const &params) const;
+                               const WifiMacHeader* hdr, 
+                               const MacLowTransmissionParameters &params) const;
   WifiMode GetRtsTxMode (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
   WifiMode GetDataTxMode (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
   WifiMode GetCtsTxModeForRts (Mac48Address to, WifiMode rtsTxMode) const;

--- a/src/devices/wifi/mac-rx-middle.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/mac-rx-middle.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -149,7 +149,7 @@
 
 
 OriginatorRxStatus *
-MacRxMiddle::Lookup (WifiMacHeader const *hdr)
+MacRxMiddle::Lookup (const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (hdr);
   OriginatorRxStatus *originator;
@@ -183,7 +183,7 @@
 }
 
 bool
-MacRxMiddle::IsDuplicate (WifiMacHeader const*hdr, 
+MacRxMiddle::IsDuplicate (const WifiMacHeader* hdr, 
                           OriginatorRxStatus *originator) const
 {
   NS_LOG_FUNCTION (hdr << originator);
@@ -196,7 +196,7 @@
 }
 
 Ptr<Packet>
-MacRxMiddle::HandleFragments (Ptr<Packet> packet, WifiMacHeader const*hdr,
+MacRxMiddle::HandleFragments (Ptr<Packet> packet, const WifiMacHeader *hdr,
                               OriginatorRxStatus *originator)
 {
   NS_LOG_FUNCTION (packet << hdr << originator);
@@ -255,7 +255,7 @@
 }
 
 void
-MacRxMiddle::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
+MacRxMiddle::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (packet << hdr);
   NS_ASSERT (hdr->IsData () || hdr->IsMgt ());

--- a/src/devices/wifi/mac-rx-middle.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/mac-rx-middle.h	Mon Nov 30 18:20:30 2009 +0100
@@ -35,19 +35,19 @@
 class MacRxMiddle
 {
 public:
-  typedef Callback<void, Ptr<Packet> , WifiMacHeader const *> ForwardUpCallback;
+  typedef Callback<void, Ptr<Packet>, const WifiMacHeader*> ForwardUpCallback;
 
   MacRxMiddle ();
   ~MacRxMiddle ();
 
   void SetForwardCallback (ForwardUpCallback callback);
 
-  void Receive (Ptr<Packet> packet, WifiMacHeader const *hdr);
+  void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
 private:
   friend class MacRxMiddleTest;
-  OriginatorRxStatus *Lookup (WifiMacHeader const*hdr);
-  bool IsDuplicate (WifiMacHeader const *hdr, OriginatorRxStatus *originator) const;
-  Ptr<Packet> HandleFragments (Ptr<Packet> packet, WifiMacHeader const*hdr,
+  OriginatorRxStatus *Lookup (const WifiMacHeader* hdr);
+  bool IsDuplicate (const WifiMacHeader* hdr, OriginatorRxStatus *originator) const;
+  Ptr<Packet> HandleFragments (Ptr<Packet> packet, const WifiMacHeader* hdr,
                                OriginatorRxStatus *originator);
   bool SequenceControlSmaller (uint16_t seqa, uint16_t seqb);
 

--- a/src/devices/wifi/nqap-wifi-mac.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/nqap-wifi-mac.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -413,7 +413,7 @@
   m_beaconEvent = Simulator::Schedule (m_beaconInterval, &NqapWifiMac::SendOneBeacon, this);
 }
 void 
-NqapWifiMac::TxOk (WifiMacHeader const &hdr)
+NqapWifiMac::TxOk (const WifiMacHeader &hdr)
 {
   NS_LOG_FUNCTION (this);
   WifiRemoteStation *station = m_stationManager->Lookup (hdr.GetAddr1 ());
@@ -425,7 +425,7 @@
     }
 }
 void 
-NqapWifiMac::TxFailed (WifiMacHeader const &hdr)
+NqapWifiMac::TxFailed (const WifiMacHeader &hdr)
 {
   NS_LOG_FUNCTION (this);
   WifiRemoteStation *station = m_stationManager->Lookup (hdr.GetAddr1 ());
@@ -437,7 +437,7 @@
     }
 }
 void 
-NqapWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
+NqapWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (this << packet << hdr);
 

--- a/src/devices/wifi/nqap-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/nqap-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -100,11 +100,11 @@
   void StartBeaconing (void);
 
 private:
-  void Receive (Ptr<Packet> packet, WifiMacHeader const *hdr);
+  void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   void ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to);
-  void TxOk (WifiMacHeader const &hdr);
-  void TxFailed (WifiMacHeader const &hdr);
+  void TxOk (const WifiMacHeader &hdr);
+  void TxFailed (const WifiMacHeader &hdr);
   void SendProbeResp (Mac48Address to);
   void SendAssocResp (Mac48Address to, bool success);
   void SendOneBeacon (void);

--- a/src/devices/wifi/nqsta-wifi-mac.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/nqsta-wifi-mac.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -501,7 +501,7 @@
 
 
 void 
-NqstaWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
+NqstaWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (this << packet << hdr);
   NS_ASSERT (!hdr->IsCtl ());

--- a/src/devices/wifi/nqsta-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/nqsta-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -123,7 +123,7 @@
   void SetActiveProbing (bool enable);
   bool GetActiveProbing (void) const;
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
-  void Receive (Ptr<Packet> packet, WifiMacHeader const *hdr);
+  void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
   Mac48Address GetBroadcastBssid (void);
   void SendProbeRequest (void);
   void SendAssociationRequest (void);

--- a/src/devices/wifi/qadhoc-wifi-mac.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qadhoc-wifi-mac.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -334,7 +334,7 @@
 }
 
 void
-QadhocWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
+QadhocWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (this << packet << hdr);
   NS_ASSERT (!hdr->IsCtl ());
@@ -360,7 +360,7 @@
 
 void
 QadhocWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
-                                           WifiMacHeader const *hdr)
+                                           const WifiMacHeader *hdr)
 {
   DeaggregatedMsdus packets = MsduAggregator::Deaggregate (aggregatedPacket);
   for (DeaggregatedMsdusCI i = packets.begin (); i != packets.end (); ++i)

--- a/src/devices/wifi/qadhoc-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qadhoc-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -78,7 +78,7 @@
 private:
   Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
   virtual void DoDispose (void);
-  void Receive (Ptr<Packet> packet, WifiMacHeader const *hdr);
+  void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   QadhocWifiMac &operator = (const QadhocWifiMac &);
   QadhocWifiMac (const QadhocWifiMac &);
@@ -87,7 +87,7 @@
   * When an A-MSDU is received, is deaggregated by this method and all extracted packets are
   * forwarded up.
   */
-  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, WifiMacHeader const *hdr);
+  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr);
 
   typedef std::map<AccessClass, Ptr<EdcaTxopN> > Queues;
   typedef std::list<std::pair<Ptr<Packet>, AmsduSubframeHeader> > DeaggregatedMsdus;

--- a/src/devices/wifi/qap-wifi-mac.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qap-wifi-mac.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -383,7 +383,7 @@
 
 void
 QapWifiMac::ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to,
-                         WifiMacHeader const *oldHdr)
+                         const WifiMacHeader *oldHdr)
 {
   /* For now Qos AP sends only Qos frame. In the future it should be able to 
      send frames also to Non-Qos Stas.
@@ -526,7 +526,7 @@
 }
 
 void
-QapWifiMac::TxOk (WifiMacHeader const &hdr)
+QapWifiMac::TxOk (const WifiMacHeader &hdr)
 {
   NS_LOG_FUNCTION (this);
   WifiRemoteStation *station = m_stationManager->Lookup (hdr.GetAddr1 ());
@@ -539,7 +539,7 @@
 }
 
 void
-QapWifiMac::TxFailed (WifiMacHeader const &hdr)
+QapWifiMac::TxFailed (const WifiMacHeader &hdr)
 {
   NS_LOG_FUNCTION (this);
   WifiRemoteStation *station = m_stationManager->Lookup (hdr.GetAddr1 ());
@@ -552,7 +552,7 @@
 }
 
 void
-QapWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
+QapWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
 {
   NS_LOG_FUNCTION (this << packet << hdr);
 
@@ -690,7 +690,7 @@
 }
 
 void
-QapWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, WifiMacHeader const *hdr)
+QapWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr)
 {
   DeaggregatedMsdus packets = MsduAggregator::Deaggregate (aggregatedPacket);
   for (DeaggregatedMsdusCI i = packets.begin (); i != packets.end (); ++i)

--- a/src/devices/wifi/qap-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qap-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -93,14 +93,14 @@
   
   virtual void DoDispose (void);
   virtual void DoStart (void);
-  void Receive (Ptr<Packet> packet, WifiMacHeader const*hdr);
+  void Receive (Ptr<Packet> packet, const WifiMacHeader* hdr);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   void ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to);
   /* Next function is invoked only when ap relies a frame. */
   void ForwardDown (Ptr<const Packet> packet, Mac48Address from, Mac48Address to,
-                    WifiMacHeader const *oldHdr);
-  void TxOk (WifiMacHeader const &hdr);
-  void TxFailed (WifiMacHeader const &hdr);
+                    const WifiMacHeader* oldHdr);
+  void TxOk (const WifiMacHeader& hdr);
+  void TxFailed (const WifiMacHeader& hdr);
   void SendProbeResp (Mac48Address to);
   void SendAssocResp (Mac48Address to, bool success);
   void SendOneBeacon (void);
@@ -108,7 +108,7 @@
   void SetBeaconGeneration (bool enable);
   bool GetBeaconGeneration (void) const;
   
-  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, WifiMacHeader const *hdr);
+  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader* hdr);
   QapWifiMac &operator = (const QapWifiMac &);
   QapWifiMac (const QapWifiMac &);
 

--- a/src/devices/wifi/qsta-wifi-mac.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qsta-wifi-mac.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -689,7 +689,7 @@
 }
 
 void
-QstaWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, WifiMacHeader const *hdr)
+QstaWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr)
 {
   DeaggregatedMsdus packets = MsduAggregator::Deaggregate (aggregatedPacket);
   for (DeaggregatedMsdusCI i = packets.begin (); i != packets.end (); ++i)

--- a/src/devices/wifi/qsta-wifi-mac.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/qsta-wifi-mac.h	Mon Nov 30 18:20:30 2009 +0100
@@ -109,7 +109,7 @@
   * When an A-MSDU is received, is deaggregated by this method and all extracted packets are
   * forwarded up.
   */
-  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, WifiMacHeader const *hdr);
+  void DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr);
 
   QstaWifiMac &operator = (const QstaWifiMac &);
   QstaWifiMac (const QstaWifiMac &);

--- a/src/devices/wifi/ssid.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/ssid.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -68,7 +68,7 @@
     }
 }
 bool 
-Ssid::IsEqual (Ssid const &o) const
+Ssid::IsEqual (const Ssid& o) const
 {
   uint8_t i = 0;
   while (i < 32 && 

--- a/src/devices/wifi/ssid.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/ssid.h	Mon Nov 30 18:20:30 2009 +0100
@@ -38,7 +38,7 @@
   Ssid (std::string s);
   Ssid (char const ssid[32], uint8_t length);
 
-  bool IsEqual (Ssid const &o) const;
+  bool IsEqual (const Ssid& o) const;
   bool IsBroadcast (void) const;
 
   uint32_t GetLength (void) const;

--- a/src/devices/wifi/status-code.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/status-code.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -40,7 +40,7 @@
 bool 
 StatusCode::IsSuccess (void) const
 {
-  return (m_code == 0)?true:false;
+  return (m_code == 0);
 }
 uint32_t 
 StatusCode::GetSerializedSize (void) const

--- a/src/devices/wifi/wifi-mac-header.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/wifi-mac-header.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -518,23 +518,23 @@
 bool 
 WifiMacHeader::IsData (void) const
 {
-  return (m_ctrlType == TYPE_DATA)?true:false;
+  return (m_ctrlType == TYPE_DATA);
     
 }
 bool 
 WifiMacHeader::IsQosData (void) const
 {
-  return (m_ctrlType == TYPE_DATA && (m_ctrlSubtype & 0x08))?true:false;
+  return (m_ctrlType == TYPE_DATA && (m_ctrlSubtype & 0x08));
 }
 bool 
 WifiMacHeader::IsCtl (void) const
 {
-  return (m_ctrlType == TYPE_CTL)?true:false;
+  return (m_ctrlType == TYPE_CTL);
 }
 bool 
 WifiMacHeader::IsMgt (void) const
 {
-  return (m_ctrlType == TYPE_MGT)?true:false;
+  return (m_ctrlType == TYPE_MGT);
 }
 bool 
 WifiMacHeader::IsCfpoll (void) const
@@ -558,77 +558,77 @@
 bool 
 WifiMacHeader::IsRts (void) const
 {
-  return (GetType () == WIFI_MAC_CTL_RTS)?true:false;
+  return (GetType () == WIFI_MAC_CTL_RTS);
 }
 bool 
 WifiMacHeader::IsCts (void) const
 {
-  return (GetType () == WIFI_MAC_CTL_CTS)?true:false;
+  return (GetType () == WIFI_MAC_CTL_CTS);
 }
 bool 
 WifiMacHeader::IsAck (void) const
 {
-  return (GetType () == WIFI_MAC_CTL_ACK)?true:false;
+  return (GetType () == WIFI_MAC_CTL_ACK);
 }
 bool 
 WifiMacHeader::IsAssocReq (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_ASSOCIATION_REQUEST)?true:false;
+  return (GetType () == WIFI_MAC_MGT_ASSOCIATION_REQUEST);
 }
 bool 
 WifiMacHeader::IsAssocResp (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_ASSOCIATION_RESPONSE)?true:false;
+  return (GetType () == WIFI_MAC_MGT_ASSOCIATION_RESPONSE);
 }
 bool 
 WifiMacHeader::IsReassocReq (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_REASSOCIATION_REQUEST)?true:false;
+  return (GetType () == WIFI_MAC_MGT_REASSOCIATION_REQUEST);
 }
 bool 
 WifiMacHeader::IsReassocResp (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_REASSOCIATION_RESPONSE)?true:false;
+  return (GetType () == WIFI_MAC_MGT_REASSOCIATION_RESPONSE);
 }
 bool 
 WifiMacHeader::IsProbeReq (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_PROBE_REQUEST)?true:false;
+  return (GetType () == WIFI_MAC_MGT_PROBE_REQUEST);
 }
 bool 
 WifiMacHeader::IsProbeResp (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_PROBE_RESPONSE)?true:false;
+  return (GetType () == WIFI_MAC_MGT_PROBE_RESPONSE);
 }
 bool 
 WifiMacHeader::IsBeacon (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_BEACON)?true:false;
+  return (GetType () == WIFI_MAC_MGT_BEACON);
 }
 bool 
 WifiMacHeader::IsDisassociation (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_DISASSOCIATION)?true:false;
+  return (GetType () == WIFI_MAC_MGT_DISASSOCIATION);
 }
 bool 
 WifiMacHeader::IsAuthentication (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_AUTHENTICATION)?true:false;
+  return (GetType () == WIFI_MAC_MGT_AUTHENTICATION);
 }
 bool 
 WifiMacHeader::IsDeauthentication (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_DEAUTHENTICATION)?true:false;
+  return (GetType () == WIFI_MAC_MGT_DEAUTHENTICATION);
 }
 bool
 WifiMacHeader::IsAction (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_ACTION)?true:false;
+  return (GetType () == WIFI_MAC_MGT_ACTION);
 }
 bool
 WifiMacHeader::IsMultihopAction (void) const
 {
-  return (GetType () == WIFI_MAC_MGT_MULTIHOP_ACTION)?true:false;
+  return (GetType () == WIFI_MAC_MGT_MULTIHOP_ACTION);
 }
 
 
@@ -660,42 +660,42 @@
 bool 
 WifiMacHeader::IsRetry (void) const
 {
-  return (m_ctrlRetry == 1)?true:false;
+  return (m_ctrlRetry == 1);
 }
 bool 
 WifiMacHeader::IsMoreFragments (void) const
 {
-  return (m_ctrlMoreFrag == 1)?true:false;
+  return (m_ctrlMoreFrag == 1);
 }
 bool 
 WifiMacHeader::IsQosBlockAck (void) const
 {
   NS_ASSERT (IsQosData ());
-  return (m_qosAckPolicy == 3)?true:false;
+  return (m_qosAckPolicy == 3);
 }
 bool 
 WifiMacHeader::IsQosNoAck (void) const
 {
   NS_ASSERT (IsQosData ());
-  return (m_qosAckPolicy == 1)?true:false;
+  return (m_qosAckPolicy == 1);
 }
 bool 
 WifiMacHeader::IsQosAck (void) const
 {
   NS_ASSERT (IsQosData ());
-  return (m_qosAckPolicy == 0)?true:false;
+  return (m_qosAckPolicy == 0);
 }
 bool
 WifiMacHeader::IsQosEosp (void) const
 {
   NS_ASSERT (IsQosData ());
-  return (m_qosEosp == 1)?true:false;
+  return (m_qosEosp == 1);
 }
 bool
 WifiMacHeader::IsQosAmsdu (void) const
 {
   NS_ASSERT (IsQosData ());
-  return (m_amsduPresent == 1)?true:false;
+  return (m_amsduPresent == 1);
 }
 uint8_t
 WifiMacHeader::GetQosTid (void) const
@@ -825,7 +825,7 @@
   }
   return size;
 }
-char const *
+const char *
 WifiMacHeader::GetTypeString (void) const
 {
 #define FOO(x) \

--- a/src/devices/wifi/wifi-mac-header.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/wifi-mac-header.h	Mon Nov 30 18:20:30 2009 +0100
@@ -174,7 +174,7 @@
   uint8_t GetQosTxopLimit (void) const;
 
   uint32_t GetSize (void) const;
-  char const *GetTypeString (void) const;
+  const char *GetTypeString (void) const;
 
 
 private:

--- a/src/devices/wifi/wifi-phy-state-helper.cc	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/wifi-phy-state-helper.cc	Mon Nov 30 18:20:30 2009 +0100
@@ -89,27 +89,27 @@
 bool 
 WifiPhyStateHelper::IsStateIdle (void)
 {
-  return (GetState () == WifiPhy::IDLE)?true:false;
+  return (GetState () == WifiPhy::IDLE);
 }
 bool 
 WifiPhyStateHelper::IsStateBusy (void)
 {
-  return (GetState () != WifiPhy::IDLE)?true:false;
+  return (GetState () != WifiPhy::IDLE);
 }
 bool 
 WifiPhyStateHelper::IsStateSync (void)
 {
-  return (GetState () == WifiPhy::SYNC)?true:false;
+  return (GetState () == WifiPhy::SYNC);
 }
 bool 
 WifiPhyStateHelper::IsStateTx (void)
 {
-  return (GetState () == WifiPhy::TX)?true:false;
+  return (GetState () == WifiPhy::TX);
 }
 bool 
 WifiPhyStateHelper::IsStateSwitching (void)
 {
-  return (GetState () == WifiPhy::SWITCHING)?true:false;
+  return (GetState () == WifiPhy::SWITCHING);
 }
 
 
@@ -157,7 +157,7 @@
   return m_startSync;
 }
 
-char const *
+const char *
 WifiPhyStateHelper::StateToString (enum WifiPhy::State state)
 {
   switch (state) {

--- a/src/devices/wifi/wifi-phy-state-helper.h	Mon Nov 30 19:25:04 2009 +0300
+++ b/src/devices/wifi/wifi-phy-state-helper.h	Mon Nov 30 18:20:30 2009 +0100
@@ -59,7 +59,7 @@
 private:
   typedef std::vector<WifiPhyListener *> Listeners;
 
-  char const *StateToString (enum WifiPhy::State state);
+  const char *StateToString (enum WifiPhy::State state);
   void LogPreviousIdleAndCcaBusyStates (void);
 
   void NotifyTxStart (Time duration);