--- a/src/devices/wifi/mac-low.cc	Tue Sep 02 12:36:37 2008 -0700
+++ b/src/devices/wifi/mac-low.cc	Tue Sep 02 13:08:47 2008 -0700
@@ -273,7 +273,6 @@
   NS_LOG_FUNCTION (this);
   CancelAllEvents ();
   m_phy = 0;
-  m_mac = 0;
   m_stationManager = 0;
 }
 
@@ -341,21 +340,11 @@
   m_phy->SetReceiveOkCallback (MakeCallback (&MacLow::ReceiveOk, this));
   m_phy->SetReceiveErrorCallback (MakeCallback (&MacLow::ReceiveError, this));
 }
-void
-MacLow::SetMac (Ptr<WifiMac> mac)
-{
-  m_mac = mac;
-}
 void 
 MacLow::SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> manager)
 {
   m_stationManager = manager;
 }
-Ptr<WifiMac> 
-MacLow::GetMac (void)
-{
-  return m_mac;
-}
 
 void 
 MacLow::SetAddress (Mac48Address ad)
@@ -387,6 +376,11 @@
 {
   m_pifs = pifs;
 }
+void
+MacLow::SetBssid (Mac48Address bssid)
+{
+  m_bssid = bssid;
+}
 Mac48Address 
 MacLow::GetAddress (void) const
 {
@@ -417,6 +411,11 @@
 {
   return m_pifs;
 }
+Mac48Address 
+MacLow::GetBssid (void) const
+{
+  return m_bssid;
+}
 
 void 
 MacLow::SetRxCallback (Callback<void,Ptr<Packet>,const WifiMacHeader *> callback)
@@ -751,7 +750,7 @@
   Time duration = hdr.GetDuration ();
 
   if (hdr.IsCfpoll () &&
-      hdr.GetAddr2 () == m_mac->GetBssid ()) 
+      hdr.GetAddr2 () == m_bssid) 
     {
       // see section 9.3.2.2 802.11-1999
       DoNavResetNow (duration);