From 12745641e618a025fb8e8de7a8240b2f0c7e82d8 Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Thu, 3 Dec 2020 09:53:52 +0100
Subject: [PATCH] wifi: Make ChannelAccessManager independent of MacLow

---
 src/wifi/model/channel-access-manager.cc | 8 --------
 src/wifi/model/channel-access-manager.h  | 7 -------
 src/wifi/model/regular-wifi-mac.cc       | 1 -
 3 files changed, 16 deletions(-)

diff --git a/src/wifi/model/channel-access-manager.cc b/src/wifi/model/channel-access-manager.cc
index 2f013e4d2..00e6a9c82 100644
--- a/src/wifi/model/channel-access-manager.cc
+++ b/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)
 {
diff --git a/src/wifi/model/channel-access-manager.h b/src/wifi/model/channel-access-manager.h
index 9a9798c59..22d312f2e 100644
--- a/src/wifi/model/channel-access-manager.h
+++ b/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.
    *
diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc
index 3359b72b6..e7f183c1f 100644
--- a/src/wifi/model/regular-wifi-mac.cc
+++ b/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);