From c03b956014beedfbc4f90c336231d76de7da3d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Mon, 2 Jan 2017 16:57:20 +0100
Subject: [PATCH] wifi: Small change in get HT/VHT capabilities/operation

---
 src/wifi/model/ap-wifi-mac.cc      | 4 ++--
 src/wifi/model/regular-wifi-mac.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index 713b357f4..10766c595 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -504,9 +504,9 @@ ApWifiMac::GetHtOperation (void) const
 {
   NS_LOG_FUNCTION (this);
   HtOperation operation;
-  operation.SetHtSupported (1);
   if (m_htSupported)
     {
+      operation.SetHtSupported (1);
       operation.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());
       if (m_nonHtStations.empty ())
         {
@@ -525,9 +525,9 @@ ApWifiMac::GetVhtOperation (void) const
 {
   NS_LOG_FUNCTION (this);
   VhtOperation operation;
-  operation.SetVhtSupported (1);
   if (m_vhtSupported)
     {
+      operation.SetVhtSupported (1);
       uint8_t channelWidth = GetVhtOperationalChannelWidth ();
       if (channelWidth == 160)
         {
diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc
index 8ef1ed225..f0046611a 100644
--- a/src/wifi/model/regular-wifi-mac.cc
+++ b/src/wifi/model/regular-wifi-mac.cc
@@ -141,9 +141,9 @@ RegularWifiMac::GetHtCapabilities (void) const
 {
   NS_LOG_FUNCTION (this);
   HtCapabilities capabilities;
-  capabilities.SetHtSupported (1);
   if (m_htSupported)
     {
+      capabilities.SetHtSupported (1);
       capabilities.SetLdpc (m_phy->GetLdpc ());
       capabilities.SetSupportedChannelWidth (m_phy->GetChannelWidth () == 40);
       capabilities.SetShortGuardInterval20 (m_phy->GetGuardInterval ());
@@ -181,9 +181,9 @@ RegularWifiMac::GetVhtCapabilities (void) const
 {
   NS_LOG_FUNCTION (this);
   VhtCapabilities capabilities;
-  capabilities.SetVhtSupported (1);
   if (m_vhtSupported)
     {
+      capabilities.SetVhtSupported (1);
       if (m_phy->GetChannelWidth () == 160)
         {
           capabilities.SetSupportedChannelWidthSet (1);