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

wifi: Add 80+80MHz support for WifiPpdu::DoesOverlapChannel

Browse Source
This commit is contained in:
Sébastien Deronne
2023-05-22 18:11:30 +02:00
parent 5c8ce8a6f6
commit 9fdb1822e0
1 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/wifi/model/wifi-ppdu.cc
View File

@@ -196,39 +196,48 @@ WifiPpdu::GetTxCenterFreqs() const
bool
WifiPpdu::DoesOverlapChannel(uint16_t minFreq, uint16_t maxFreq) const
{
NS_LOG_FUNCTION(this << m_txCenterFreqs.front() << minFreq << maxFreq);
uint16_t minTxFreq = m_txCenterFreqs.front() - m_txChannelWidth / 2;
uint16_t maxTxFreq = m_txCenterFreqs.front() + m_txChannelWidth / 2;
/**
* The PPDU does not overlap the channel in two cases.
*
* First non-overlapping case:
*
* ┌─────────┐
* PPDU │ Nominal │
* │ Band │
* └─────────┘
* minTxFreq maxTxFreq
*
* minFreq maxFreq
* ┌──────────────────────────────┐
* │ Channel │
* └──────────────────────────────┘
*
* Second non-overlapping case:
*
* ┌─────────┐
* PPDU │ Nominal │
* │ Band │
* └─────────┘
* minTxFreq maxTxFreq
*
* minFreq maxFreq
* ┌──────────────────────────────┐
* │ Channel │
* └──────────────────────────────┘
*/
return minTxFreq < maxFreq && maxTxFreq > minFreq;
NS_LOG_FUNCTION(this << minFreq << maxFreq);
// all segments have the same width
const auto txChannelWidth = (m_txChannelWidth / m_txCenterFreqs.size());
for (auto txCenterFreq : m_txCenterFreqs)
{
const auto minTxFreq = txCenterFreq - txChannelWidth / 2;
const auto maxTxFreq = txCenterFreq + txChannelWidth / 2;
/**
* The PPDU does not overlap the channel in two cases.
*
* First non-overlapping case:
*
* ┌─────────┐
* PPDU │ Nominal │
* │ Band │
* └─────────┘
* minTxFreq maxTxFreq
*
* minFreq maxFreq
* ┌──────────────────────────────┐
* │ Channel │
* └──────────────────────────────┘
*
* Second non-overlapping case:
*
* ┌─────────┐
* PPDU │ Nominal │
* │ Band │
* └─────────┘
* minTxFreq maxTxFreq
*
* minFreq maxFreq
* ┌──────────────────────────────┐
* │ Channel │
* └──────────────────────────────┘
*/
if ((minTxFreq < maxFreq) && (maxTxFreq > minFreq))
{
return true;
}
}
return false;
}
uint64_t