wifi: Make ChannelAccessManager independent of MacLow

src/wifi/model/channel-access-manager.cc

@@ -24,7 +24,6 @@
 #include "txop.h"
 #include "wifi-phy-listener.h"
 #include "wifi-phy.h"
-#include "mac-low.h"
 #include "frame-exchange-manager.h"
 
 namespace ns3 {
@@ -163,13 +162,6 @@ ChannelAccessManager::RemovePhyListener (Ptr<WifiPhy> phy)
     }
 }
 
-void
-ChannelAccessManager::SetupLow (Ptr<MacLow> low)
-{
-  NS_LOG_FUNCTION (this << low);
-  low->RegisterChannelAccessManager (this);
-}
-
 void
 ChannelAccessManager::SetupFrameExchangeManager (Ptr<FrameExchangeManager> feManager)
 {

src/wifi/model/channel-access-manager.h

@@ -31,7 +31,6 @@ namespace ns3 {
 class WifiPhy;
 class PhyListener;
 class Txop;
-class MacLow;
 class FrameExchangeManager;
 
 /**
@@ -67,12 +66,6 @@ public:
    * \param phy the WifiPhy to listen to
    */
   void RemovePhyListener (Ptr<WifiPhy> phy);
-  /**
-   * Set up listener for MacLow events.
-   *
-   * \param low the MacLow to listen to
-   */
-  void SetupLow (Ptr<MacLow> low);
   /**
    * Set up the Frame Exchange Manager.
    *

src/wifi/model/regular-wifi-mac.cc

@@ -60,7 +60,6 @@ RegularWifiMac::RegularWifiMac ()
   m_low->SetMac (this);
 
   m_channelAccessManager = CreateObject<ChannelAccessManager> ();
-  m_channelAccessManager->SetupLow (m_low);
 
   m_txop = CreateObject<Txop> ();
   m_txop->SetMacLow (m_low);