From 787a75de0197642d85b766f0577643afec1e5310 Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Mon, 24 Apr 2023 14:28:23 +0200
Subject: [PATCH] wifi: Get rid of anonymous enum in StaWifiMac

---
 src/wifi/model/sta-wifi-mac.cc               |  4 ++--
 src/wifi/model/sta-wifi-mac.h                | 18 ++++++++++++------
 src/wifi/model/wifi-default-assoc-manager.cc |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc
index 3da1a1ace..62218eab9 100644
--- a/src/wifi/model/sta-wifi-mac.cc
+++ b/src/wifi/model/sta-wifi-mac.cc
@@ -523,13 +523,13 @@ StaWifiMac::StartScanning()
     }
     if (m_activeProbing)
     {
-        scanParams.type = WifiScanParams::ACTIVE;
+        scanParams.type = WifiScanType::ACTIVE;
         scanParams.probeDelay = MicroSeconds(m_probeDelay->GetValue());
         scanParams.minChannelTime = scanParams.maxChannelTime = m_probeRequestTimeout;
     }
     else
     {
-        scanParams.type = WifiScanParams::PASSIVE;
+        scanParams.type = WifiScanType::PASSIVE;
         scanParams.maxChannelTime = m_waitBeaconTimeout;
     }
 
diff --git a/src/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h
index fc76a9f86..18bbc31e4 100644
--- a/src/wifi/model/sta-wifi-mac.h
+++ b/src/wifi/model/sta-wifi-mac.h
@@ -41,6 +41,17 @@ class CapabilityInformation;
 class RandomVariableStream;
 class WifiAssocManager;
 
+/**
+ * \ingroup wifi
+ *
+ * Scan type (active or passive)
+ */
+enum class WifiScanType : uint8_t
+{
+    ACTIVE = 0,
+    PASSIVE
+};
+
 /**
  * \ingroup wifi
  *
@@ -63,12 +74,7 @@ struct WifiScanParams
     /// typedef for a list of channels
     using ChannelList = std::list<Channel>;
 
-    enum : uint8_t
-    {
-        ACTIVE = 0,
-        PASSIVE
-    } type; ///< indicates either active or passive scanning
-
+    WifiScanType type;                    ///< indicates either active or passive scanning
     Ssid ssid;                            ///< desired SSID or wildcard SSID
     std::vector<ChannelList> channelList; ///< list of channels to scan, for each link
     Time probeDelay;                      ///< delay prior to transmitting a Probe Request
diff --git a/src/wifi/model/wifi-default-assoc-manager.cc b/src/wifi/model/wifi-default-assoc-manager.cc
index 61df984fa..79e6e81a7 100644
--- a/src/wifi/model/wifi-default-assoc-manager.cc
+++ b/src/wifi/model/wifi-default-assoc-manager.cc
@@ -94,7 +94,7 @@ WifiDefaultAssocManager::DoStartScanning()
     m_probeRequestEvent.Cancel();
     m_waitBeaconEvent.Cancel();
 
-    if (GetScanParams().type == WifiScanParams::ACTIVE)
+    if (GetScanParams().type == WifiScanType::ACTIVE)
     {
         for (uint8_t linkId = 0; linkId < m_mac->GetNLinks(); linkId++)
         {