--- a/src/wifi/model/yans-wifi-channel.cc Tue Aug 13 10:37:49 2013 -0700
+++ b/src/wifi/model/yans-wifi-channel.cc Tue Aug 13 22:05:25 2013 -0700
@@ -76,11 +76,12 @@
void
YansWifiChannel::Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,
- WifiMode wifiMode, WifiPreamble preamble) const
+ WifiTxVector txVector, WifiPreamble preamble) const
{
Ptr<MobilityModel> senderMobility = sender->GetMobility ()->GetObject<MobilityModel> ();
NS_ASSERT (senderMobility != 0);
uint32_t j = 0;
+ WifiMode wifiMode=txVector.GetMode();
for (PhyList::const_iterator i = m_phyList.begin (); i != m_phyList.end (); i++, j++)
{
if (sender != (*i))
@@ -109,16 +110,16 @@
}
Simulator::ScheduleWithContext (dstNode,
delay, &YansWifiChannel::Receive, this,
- j, copy, rxPowerDbm, wifiMode, preamble);
+ j, copy, rxPowerDbm, txVector, preamble);
}
}
}
void
YansWifiChannel::Receive (uint32_t i, Ptr<Packet> packet, double rxPowerDbm,
- WifiMode txMode, WifiPreamble preamble) const
+ WifiTxVector txVector, WifiPreamble preamble) const
{
- m_phyList[i]->StartReceivePacket (packet, rxPowerDbm, txMode, preamble);
+ m_phyList[i]->StartReceivePacket (packet, rxPowerDbm, txVector, preamble);
}
uint32_t