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

Temporarily force a 10 MHz channel width in WAVE

Browse Source
This commit is contained in:
Sébastien Deronne
2015-09-04 22:18:05 +02:00
parent d8b035323a
commit e10f0cd061
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wave/model/vsa-manager.cc
View File

@@ -174,6 +174,7 @@ VsaManager::DoSendVsa (enum VsaTransmitInterval interval, uint32_t channel,
vsc->AddPacketTag (qosTag);
WifiTxVector txVector;
txVector.SetChannelWidth (10);
txVector.SetTxPowerLevel (manager->GetManagementPowerLevel (channel));
txVector.SetMode (manager->GetManagementDataRate (channel));
HigherLayerTxVectorTag tag = HigherLayerTxVectorTag (txVector, manager->GetManagementAdaptable (channel));

1
src/wave/model/wave-mac-low.cc
View File

@@ -82,6 +82,7 @@ WaveMacLow::GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr)
WifiTxVector txHigher = datatag.GetTxVector ();
WifiTxVector txMac = MacLow::GetDataTxVector (packet, hdr);
WifiTxVector txAdapter;
txAdapter.SetChannelWidth (10);
// the DataRate set by higher layer is the minimum data rate
// which is the lower bound for the actual data rate.
if (txHigher.GetMode ().GetDataRate (txHigher.GetChannelWidth (), txHigher.IsShortGuardInterval (), 1) > txMac.GetMode ().GetDataRate (txMac.GetChannelWidth (), txMac.IsShortGuardInterval (), 1))

1
src/wave/model/wave-net-device.cc
View File

@@ -408,6 +408,7 @@ WaveNetDevice::SendX (Ptr<Packet> packet, const Address & dest, uint32_t protoco
}
}
WifiTxVector txVector;
txVector.SetChannelWidth (10);
txVector.SetTxPowerLevel (txInfo.txPowerLevel);
txVector.SetMode (txInfo.dataRate);
HigherLayerTxVectorTag tag = HigherLayerTxVectorTag (txVector, false);