--- 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)