wifi: Fix aPSDUMaxLength for 802.11be

sderonne · sderonne · commit cd6e07180ca9 · 2025-11-09T09:26:35.000+01:00
Issue reported by Sharan Naribole
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -38,6 +38,8 @@ been tested on Linux. As of this release, the latest known version to work with
 
 ### Bugs fixed
 
+- (wifi) Fix incorrect aPSDUMaxLength value for 802.11be.
+
 ## Release 3.46.1
 
 ns-3.46.1 is a small update to ns-3.46 to fix build issues discovered after release.
diff --git a/src/wifi/model/eht/eht-phy.cc b/src/wifi/model/eht/eht-phy.cc
@@ -428,6 +428,12 @@ EhtPhy::CalculateNonHtReferenceRate(WifiCodeRate codeRate, uint16_t constellatio
     return dataRate;
 }
 
+uint32_t
+EhtPhy::GetMaxPsduSize() const
+{
+    return WIFI_PSDU_MAX_LENGTH_EHT;
+}
+
 dBm_u
 EhtPhy::Per20MHzCcaThreshold(const Ptr<const WifiPpdu> ppdu) const
 {
diff --git a/src/wifi/model/eht/eht-phy.h b/src/wifi/model/eht/eht-phy.h
@@ -252,6 +252,7 @@ class EhtPhy : public HePhy
                                 WifiPpduField field) override;
     WifiPhyRxfailureReason GetFailureReason(WifiPpduField field) const override;
     uint32_t GetSigBSize(const WifiTxVector& txVector) const override;
+    uint32_t GetMaxPsduSize() const override;
     dBm_u GetCcaThreshold(const Ptr<const WifiPpdu> ppdu,
                           WifiChannelListType channelType) const override;
     const std::map<MHz_u, WifiChannelListType>& GetCcaSecondaryChannels() const override;
diff --git a/src/wifi/model/he/he-phy.cc b/src/wifi/model/he/he-phy.cc
@@ -1779,7 +1779,7 @@ HePhy::GetWifiConstPsduMap(Ptr<const WifiPsdu> psdu, const WifiTxVector& txVecto
 uint32_t
 HePhy::GetMaxPsduSize() const
 {
-    return 6500631;
+    return WIFI_PSDU_MAX_LENGTH_HE;
 }
 
 bool
diff --git a/src/wifi/model/ht/ht-phy.cc b/src/wifi/model/ht/ht-phy.cc
@@ -816,7 +816,7 @@ HtPhy::IsAllowed(const WifiTxVector& /*txVector*/)
 uint32_t
 HtPhy::GetMaxPsduSize() const
 {
-    return 65535;
+    return WIFI_PSDU_MAX_LENGTH_HT;
 }
 
 const std::map<MHz_u, WifiChannelListType>&
diff --git a/src/wifi/model/non-ht/dsss-phy.cc b/src/wifi/model/non-ht/dsss-phy.cc
@@ -387,7 +387,7 @@ DsssPhy::IsAllowed(const WifiTxVector& /*txVector*/)
 uint32_t
 DsssPhy::GetMaxPsduSize() const
 {
-    return 4095;
+    return WIFI_PSDU_MAX_LENGTH;
 }
 
 } // namespace ns3
diff --git a/src/wifi/model/non-ht/erp-ofdm-phy.cc b/src/wifi/model/non-ht/erp-ofdm-phy.cc
@@ -234,7 +234,7 @@ ErpOfdmPhy::IsAllowed(const WifiTxVector& /*txVector*/)
 uint32_t
 ErpOfdmPhy::GetMaxPsduSize() const
 {
-    return 4095;
+    return WIFI_PSDU_MAX_LENGTH;
 }
 
 } // namespace ns3
diff --git a/src/wifi/model/non-ht/ofdm-phy.cc b/src/wifi/model/non-ht/ofdm-phy.cc
@@ -650,7 +650,7 @@ OfdmPhy::IsAllowed(const WifiTxVector& /*txVector*/)
 uint32_t
 OfdmPhy::GetMaxPsduSize() const
 {
-    return 4095;
+    return WIFI_PSDU_MAX_LENGTH;
 }
 
 MHz_u
diff --git a/src/wifi/model/vht/vht-phy.cc b/src/wifi/model/vht/vht-phy.cc
@@ -520,7 +520,7 @@ VhtPhy::IsCombinationAllowed(uint8_t mcsValue, MHz_u channelWidth, uint8_t nss)
 uint32_t
 VhtPhy::GetMaxPsduSize() const
 {
-    return 4692480;
+    return WIFI_PSDU_MAX_LENGTH_VHT;
 }
 
 dBm_u
diff --git a/src/wifi/model/wifi-standard-constants.h b/src/wifi/model/wifi-standard-constants.h
@@ -87,6 +87,22 @@ static constexpr uint16_t MAX_MSDU_SIZE{2304};
 /// The length in octets of the IEEE 802.11 MAC FCS field
 static constexpr uint16_t WIFI_MAC_FCS_LENGTH{4};
 
+/// The value for aPSDUMaxLength in Table 15-5 (DSSS PHY characteristics), Table 17-21 (OFDM PHY
+/// characteristics) and Table 18-5 (ERP characteristics) of 802.11-2020
+static constexpr uint32_t WIFI_PSDU_MAX_LENGTH{4095};
+
+/// The value for aPSDUMaxLength in Table 19-25 (HT PHY characteristics) of 802.11-2020
+static constexpr uint32_t WIFI_PSDU_MAX_LENGTH_HT{65'535};
+
+/// The value for aPSDUMaxLength in Table 21-28 (VHT PHY characteristics) of 802.11-2020
+static constexpr uint32_t WIFI_PSDU_MAX_LENGTH_VHT{4'692'480};
+
+/// The value for aPSDUMaxLength in Table 27-54 (HE PHY characteristics) of 802.11ax-2021
+static constexpr uint32_t WIFI_PSDU_MAX_LENGTH_HE{6'500'631};
+
+/// The value for aPSDUMaxLength in Table 36-70 (EHT PHY characteristics) of 802.11be D7.0
+static constexpr uint32_t WIFI_PSDU_MAX_LENGTH_EHT{15'523'200};
+
 /// The minimum value for dot11RTSThreshold (C.3 MIB detail in IEEE Std 802.11-2020)
 static constexpr uint32_t WIFI_MIN_RTS_THRESHOLD{0};
 

Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,12 @@ EhtPhy::CalculateNonHtReferenceRate(WifiCodeRate codeRate, uint16_t constellatio`
`428`	`428`	`return dataRate;`
`429`	`429`	`}`
`430`	`430`
	`431`	`+uint32_t`
	`432`	`+EhtPhy::GetMaxPsduSize() const`
	`433`	`+{`
	`434`	`+ return WIFI_PSDU_MAX_LENGTH_EHT;`
	`435`	`+}`
	`436`	`+`
`431`	`437`	`dBm_u`
`432`	`438`	`EhtPhy::Per20MHzCcaThreshold(const Ptr<const WifiPpdu> ppdu) const`
`433`	`439`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1779,7 +1779,7 @@ HePhy::GetWifiConstPsduMap(Ptr<const WifiPsdu> psdu, const WifiTxVector& txVecto`
`1779`	`1779`	`uint32_t`
`1780`	`1780`	`HePhy::GetMaxPsduSize() const`
`1781`	`1781`	`{`
`1782`		`- return 6500631;`
	`1782`	`+ return WIFI_PSDU_MAX_LENGTH_HE;`
`1783`	`1783`	`}`
`1784`	`1784`
`1785`	`1785`	`bool`
Original file line number	Diff line number	Diff line change
`@@ -816,7 +816,7 @@ HtPhy::IsAllowed(const WifiTxVector& /txVector/)`
`816`	`816`	`uint32_t`
`817`	`817`	`HtPhy::GetMaxPsduSize() const`
`818`	`818`	`{`
`819`		`- return 65535;`
	`819`	`+ return WIFI_PSDU_MAX_LENGTH_HT;`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`const std::map<MHz_u, WifiChannelListType>&`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ DsssPhy::IsAllowed(const WifiTxVector& /txVector/)`
`387`	`387`	`uint32_t`
`388`	`388`	`DsssPhy::GetMaxPsduSize() const`
`389`	`389`	`{`
`390`		`- return 4095;`
	`390`	`+ return WIFI_PSDU_MAX_LENGTH;`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`} // namespace ns3`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ ErpOfdmPhy::IsAllowed(const WifiTxVector& /txVector/)`
`234`	`234`	`uint32_t`
`235`	`235`	`ErpOfdmPhy::GetMaxPsduSize() const`
`236`	`236`	`{`
`237`		`- return 4095;`
	`237`	`+ return WIFI_PSDU_MAX_LENGTH;`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`} // namespace ns3`
Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ OfdmPhy::IsAllowed(const WifiTxVector& /txVector/)`
`650`	`650`	`uint32_t`
`651`	`651`	`OfdmPhy::GetMaxPsduSize() const`
`652`	`652`	`{`
`653`		`- return 4095;`
	`653`	`+ return WIFI_PSDU_MAX_LENGTH;`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`MHz_u`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ VhtPhy::IsCombinationAllowed(uint8_t mcsValue, MHz_u channelWidth, uint8_t nss)`
`520`	`520`	`uint32_t`
`521`	`521`	`VhtPhy::GetMaxPsduSize() const`
`522`	`522`	`{`
`523`		`- return 4692480;`
	`523`	`+ return WIFI_PSDU_MAX_LENGTH_VHT;`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`dBm_u`