From eb0b861236dd72a303cb0f1a27e41b5b014747ce Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@gmail.com>
Date: Wed, 27 Mar 2024 13:01:08 +0100
Subject: [PATCH] wifi: Obsolete Txop attributes MinCw, MaxCw, Aifsn and
 TxopLimit

These attributes cannot hold an "empty" value which is needed to
indicate that the user wants to use the default value defined by
the standard. The corresponding attributes for multi-link devices
can be used instead.
---
 CHANGES.md             |  2 +-
 src/wifi/model/txop.cc | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ff31b3871..68a59e26d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -39,7 +39,7 @@ Applications have a new Attribute to set the IPv4 ToS field.
 * (lr-wpan) In the MAC layer, renamed `m_selfExt` to the variable `m_macExtendedAddress` to make it consistent with the standard specification.
 * (lr-wpan) The Lr-wpan module now uses the namespace `lrwpan`.
 * (lr-wpan) The `LrWpan` prefix of variables, structs and enumerations in the PHY and MAC was shorten to reflect the recent namespace change.
-
+* (wifi) Obsoleted **Txop** attributes `MinCw`, `MaxCw`, `Aifsn` and `TxopLimit`. The corresponding attributes for multi-link devices (`MinCws`, `MaxCws`, `Aifsns` and `TxopLimits`) can be used instead.
 
 ### Changes to build system
 
diff --git a/src/wifi/model/txop.cc b/src/wifi/model/txop.cc
index 3b9dee570..f3b7ed2ca 100644
--- a/src/wifi/model/txop.cc
+++ b/src/wifi/model/txop.cc
@@ -82,7 +82,9 @@ Txop::GetTypeId()
                           UintegerValue(15),
                           MakeUintegerAccessor((void(Txop::*)(uint32_t)) & Txop::SetMinCw,
                                                (uint32_t(Txop::*)() const) & Txop::GetMinCw),
-                          MakeUintegerChecker<uint32_t>())
+                          MakeUintegerChecker<uint32_t>(),
+                          TypeId::OBSOLETE,
+                          "Use MinCws attribute instead of MinCw")
             .AddAttribute(
                 "MinCws",
                 "The minimum values of the contention window for all the links",
@@ -97,7 +99,9 @@ Txop::GetTypeId()
                           UintegerValue(1023),
                           MakeUintegerAccessor((void(Txop::*)(uint32_t)) & Txop::SetMaxCw,
                                                (uint32_t(Txop::*)() const) & Txop::GetMaxCw),
-                          MakeUintegerChecker<uint32_t>())
+                          MakeUintegerChecker<uint32_t>(),
+                          TypeId::OBSOLETE,
+                          "Use MaxCws attribute instead of MaxCw")
             .AddAttribute(
                 "MaxCws",
                 "The maximum values of the contention window for all the links",
@@ -113,7 +117,9 @@ Txop::GetTypeId()
                 UintegerValue(2),
                 MakeUintegerAccessor((void(Txop::*)(uint8_t)) & Txop::SetAifsn,
                                      (uint8_t(Txop::*)() const) & Txop::GetAifsn),
-                MakeUintegerChecker<uint8_t>())
+                MakeUintegerChecker<uint8_t>(),
+                TypeId::OBSOLETE,
+                "Use Aifsns attribute instead of Aifsn")
             .AddAttribute(
                 "Aifsns",
                 "The values of AIFSN for all the links",
@@ -128,7 +134,9 @@ Txop::GetTypeId()
                           TimeValue(MilliSeconds(0)),
                           MakeTimeAccessor((void(Txop::*)(Time)) & Txop::SetTxopLimit,
                                            (Time(Txop::*)() const) & Txop::GetTxopLimit),
-                          MakeTimeChecker())
+                          MakeTimeChecker(),
+                          TypeId::OBSOLETE,
+                          "Use TxopLimits attribute instead of TxopLimit")
             .AddAttribute("TxopLimits",
                           "The values of TXOP limit for all the links",
                           TypeId::ATTR_GET | TypeId::ATTR_SET, // do not set at construction time