F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Send RTS as non-HT dup if protecting a frame occupying at least 40 MHz

Browse Source
This commit is contained in:
Stefano Avallone
2023-07-09 19:36:25 +02:00
committed by Stefano Avallone
parent d267f68c96
commit 5ae44a876e
8 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/model/he/rr-multi-user-scheduler.cc
View File

@@ -320,7 +320,8 @@ RrMultiUserScheduler::TrySendingBsrpTf()
m_txParams.Clear();
// set the TXVECTOR used to send the Trigger Frame
m_txParams.m_txVector =
m_apMac->GetWifiRemoteStationManager(m_linkId)->GetRtsTxVector(m_triggerMacHdr.GetAddr1());
m_apMac->GetWifiRemoteStationManager(m_linkId)->GetRtsTxVector(m_triggerMacHdr.GetAddr1(),
m_allowedWidth);
if (!GetHeFem(m_linkId)->TryAddMpdu(item, m_txParams, m_availableTime))
{
@@ -442,7 +443,8 @@ RrMultiUserScheduler::TrySendingBasicTf()
m_txParams.Clear();
// set the TXVECTOR used to send the Trigger Frame
m_txParams.m_txVector =
m_apMac->GetWifiRemoteStationManager(m_linkId)->GetRtsTxVector(m_triggerMacHdr.GetAddr1());
m_apMac->GetWifiRemoteStationManager(m_linkId)->GetRtsTxVector(m_triggerMacHdr.GetAddr1(),
m_allowedWidth);
if (!GetHeFem(m_linkId)->TryAddMpdu(item, m_txParams, m_availableTime))
{

3
src/wifi/model/qos-frame-exchange-manager.cc
View File

@@ -97,7 +97,8 @@ QosFrameExchangeManager::SendCfEndIfNeeded()
cfEnd.SetAddr1(Mac48Address::GetBroadcast());
cfEnd.SetAddr2(m_self);
WifiTxVector cfEndTxVector = GetWifiRemoteStationManager()->GetRtsTxVector(cfEnd.GetAddr1());
WifiTxVector cfEndTxVector =
GetWifiRemoteStationManager()->GetRtsTxVector(cfEnd.GetAddr1(), m_allowedWidth);
auto mpdu = Create<WifiMpdu>(Create<Packet>(), cfEnd);
auto txDuration =

4
src/wifi/model/wifi-default-ack-manager.cc
View File

@@ -572,7 +572,9 @@ WifiDefaultAckManager::GetAckInfoIfTfMuBar(Ptr<const WifiMpdu> mpdu,
m_mac->GetBaTypeAsOriginator(receiver, tid)});
acknowledgment->barTypes.push_back(m_mac->GetBarTypeAsOriginator(receiver, tid));
acknowledgment->muBarTxVector = GetWifiRemoteStationManager()->GetRtsTxVector(receiver);
acknowledgment->muBarTxVector =
GetWifiRemoteStationManager()->GetRtsTxVector(receiver,
txParams.m_txVector.GetChannelWidth());
acknowledgment->SetQosAckPolicy(receiver, tid, WifiMacHeader::BLOCK_ACK);
return std::unique_ptr<WifiDlMuTfMuBar>(acknowledgment);
}

9
src/wifi/model/wifi-default-protection-manager.cc
View File

@@ -207,7 +207,9 @@ WifiDefaultProtectionManager::GetPsduProtection(const WifiMacHeader& hdr,
if (emlsrNeedRts || GetWifiRemoteStationManager()->NeedRts(hdr, size))
{
auto protection = std::make_unique<WifiRtsCtsProtection>();
protection->rtsTxVector = GetWifiRemoteStationManager()->GetRtsTxVector(hdr.GetAddr1());
protection->rtsTxVector =
GetWifiRemoteStationManager()->GetRtsTxVector(hdr.GetAddr1(),
txVector.GetChannelWidth());
protection->ctsTxVector =
GetWifiRemoteStationManager()->GetCtsTxVector(hdr.GetAddr1(),
protection->rtsTxVector.GetMode());
@@ -301,7 +303,8 @@ WifiDefaultProtectionManager::TryAddMpduToMuPpdu(Ptr<const WifiMpdu> mpdu,
}
// compute the TXVECTOR to use to send the MU-RTS Trigger Frame
protection->muRtsTxVector = GetWifiRemoteStationManager()->GetRtsTxVector(receiver);
protection->muRtsTxVector =
GetWifiRemoteStationManager()->GetRtsTxVector(receiver, txWidth);
// The transmitter of an MU-RTS Trigger frame shall not request a non-AP STA to send
// a CTS frame response in a 20 MHz channel that is not occupied by the PPDU that
// contains the MU-RTS Trigger frame. (Sec. 26.2.6.2 of 802.11ax)
@@ -391,7 +394,7 @@ WifiDefaultProtectionManager::TryUlMuTransmission(Ptr<const WifiMpdu> mpdu,
// compute the TXVECTOR to use to send the MU-RTS Trigger Frame
protection->muRtsTxVector =
GetWifiRemoteStationManager()->GetRtsTxVector(mpdu->GetHeader().GetAddr1());
GetWifiRemoteStationManager()->GetRtsTxVector(mpdu->GetHeader().GetAddr1(), txWidth);
// The transmitter of an MU-RTS Trigger frame shall not request a non-AP STA to send
// a CTS frame response in a 20 MHz channel that is not occupied by the PPDU that
// contains the MU-RTS Trigger frame. (Sec. 26.2.6.2 of 802.11ax)

32
src/wifi/model/wifi-remote-station-manager.cc
View File

@@ -701,13 +701,13 @@ WifiRemoteStationManager::GetCtsToSelfTxVector()
}
WifiTxVector
WifiRemoteStationManager::GetRtsTxVector(Mac48Address address)
WifiRemoteStationManager::GetRtsTxVector(Mac48Address address, uint16_t allowedWidth)
{
NS_LOG_FUNCTION(this << address);
NS_LOG_FUNCTION(this << address << allowedWidth);
WifiTxVector v;
if (address.IsGroup())
{
WifiMode mode = GetNonUnicastMode();
WifiTxVector v;
v.SetMode(mode);
v.SetPreambleType(
GetPreambleForTransmission(mode.GetModulationClass(), GetShortPreambleEnabled()));
@@ -717,9 +717,31 @@ WifiRemoteStationManager::GetRtsTxVector(Mac48Address address)
v.SetNTx(GetNumberOfAntennas());
v.SetNss(1);
v.SetNess(0);
return v;
}
return DoGetRtsTxVector(Lookup(address));
else
{
v = DoGetRtsTxVector(Lookup(address));
}
auto modulation = v.GetModulationClass();
if (allowedWidth >= 40 &&
(modulation == WIFI_MOD_CLASS_DSSS || modulation == WIFI_MOD_CLASS_HR_DSSS))
{
// RTS must be sent in a non-HT duplicate PPDU because it must protect a frame being
// transmitted on at least 40 MHz. Change the modulation class to ERP-OFDM and the rate
// to 6 Mbps
v.SetMode(ErpOfdmPhy::GetErpOfdmRate6Mbps());
modulation = v.GetModulationClass();
}
// do not set allowedWidth as the TX width if the modulation class is (HR-)DSSS (allowedWidth
// may be >= 40 MHz) or allowedWidth is 22 MHz (the selected modulation class may be OFDM)
if (modulation != WIFI_MOD_CLASS_DSSS && modulation != WIFI_MOD_CLASS_HR_DSSS &&
allowedWidth != 22)
{
v.SetChannelWidth(allowedWidth);
}
return v;
}
WifiTxVector

3
src/wifi/model/wifi-remote-station-manager.h
View File

@@ -816,11 +816,12 @@ class WifiRemoteStationManager : public Object
WifiTxVector GetDataTxVector(const WifiMacHeader& header, uint16_t allowedWidth);
/**
* \param address remote address
* \param allowedWidth the allowed width in MHz for the data frame being protected
*
* \return the TXVECTOR to use to send the RTS prior to the
* transmission of the data packet itself.
*/
WifiTxVector GetRtsTxVector(Mac48Address address);
WifiTxVector GetRtsTxVector(Mac48Address address, uint16_t allowedWidth);
/**
* Return a TXVECTOR for the CTS frame given the destination and the mode of the RTS
* used by the sender.

3
src/wifi/test/wifi-emlsr-test.cc
View File

@@ -2026,7 +2026,8 @@ EmlsrDlTxopTest::CheckBlockAck(const WifiConstPsduMap& psduMap,
auto txDuration = WifiPhy::CalculateTxDuration(psduMap, txVector, apPhy->GetPhyBand());
auto cfEndTxDuration = WifiPhy::CalculateTxDuration(
Create<WifiPsdu>(Create<Packet>(), WifiMacHeader(WIFI_MAC_CTL_END)),
m_apMac->GetWifiRemoteStationManager(linkId)->GetRtsTxVector(Mac48Address::GetBroadcast()),
m_apMac->GetWifiRemoteStationManager(linkId)->GetRtsTxVector(Mac48Address::GetBroadcast(),
txVector.GetChannelWidth()),
apPhy->GetPhyBand());
m_countBlockAck++;

3
src/wifi/test/wifi-mac-ofdma-test.cc
View File

@@ -186,7 +186,8 @@ TestMultiUserScheduler::SelectTxFormat()
m_txParams.Clear();
// set the TXVECTOR used to send the Trigger Frame
m_txParams.m_txVector =
m_apMac->GetWifiRemoteStationManager()->GetRtsTxVector(m_triggerHdr.GetAddr1());
m_apMac->GetWifiRemoteStationManager()->GetRtsTxVector(m_triggerHdr.GetAddr1(),
m_allowedWidth);
if (!GetHeFem(SINGLE_LINK_OP_ID)->TryAddMpdu(item, m_txParams, m_availableTime) ||
(m_availableTime != Time::Min() &&