From 9ea775b0e9e476b9496bed7963ead72003d7419c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sun, 21 Feb 2021 21:15:05 +0100 Subject: [PATCH] wifi: Create PHY entity for 802.11be STAs --- src/wifi/model/wifi-phy-operating-channel.cc | 4 ++-- src/wifi/model/wifi-phy.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wifi/model/wifi-phy-operating-channel.cc b/src/wifi/model/wifi-phy-operating-channel.cc index 51d05fbe5..0a211ea88 100644 --- a/src/wifi/model/wifi-phy-operating-channel.cc +++ b/src/wifi/model/wifi-phy-operating-channel.cc @@ -71,7 +71,7 @@ const std::set WifiPhyOperatingChannel::m_frequencyChannel { std::make_tuple (10, 2457, 40, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_2_4GHZ) }, { std::make_tuple (11, 2462, 40, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_2_4GHZ) }, - // Now the 5 GHz channels used for 802.11a/n/ac/ax + // Now the 5 GHz channels used for 802.11a/n/ac/ax/be // 20 MHz channels { std::make_tuple (36, 5180, 20, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_5GHZ) }, { std::make_tuple (40, 5200, 20, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_5GHZ) }, @@ -148,7 +148,7 @@ const std::set WifiPhyOperatingChannel::m_frequencyChannel { std::make_tuple (181, 5910, 5, WIFI_PHY_80211p_CHANNEL, WIFI_PHY_BAND_5GHZ) }, { std::make_tuple (183, 5920, 5, WIFI_PHY_80211p_CHANNEL, WIFI_PHY_BAND_5GHZ) }, - // Now the 6 GHz channels (802.11ax only) + // Now the 6 GHz channels for 802.11ax/be // 20 MHz channels { std::make_tuple (1, 5945, 20, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_6GHZ) }, { std::make_tuple (5, 5965, 20, WIFI_PHY_OFDM_CHANNEL, WIFI_PHY_BAND_6GHZ) }, diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index e33dce09b..7eb6419b9 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -44,7 +44,7 @@ #include "wifi-ppdu.h" #include "ns3/dsss-phy.h" #include "ns3/erp-ofdm-phy.h" -#include "ns3/he-phy.h" //includes OFDM, HT, and VHT +#include "ns3/eht-phy.h" //also includes OFDM, HT, VHT and HE namespace ns3 { @@ -870,6 +870,7 @@ WifiPhy::Configure80211be (void) { NS_LOG_FUNCTION (this); Configure80211ax (); + AddPhyEntity (WIFI_MOD_CLASS_EHT, Create ()); } void