--- a/src/wifi/examples/wifi-phy-test.cc Tue Aug 13 10:37:49 2013 -0700
+++ b/src/wifi/examples/wifi-phy-test.cc Tue Aug 13 22:05:25 2013 -0700
@@ -33,6 +33,7 @@
#include "ns3/nstime.h"
#include "ns3/command-line.h"
#include "ns3/flow-id-tag.h"
+#include "ns3/wifi-tx-vector.h"
using namespace ns3;
@@ -69,7 +70,10 @@
{
Ptr<Packet> p = Create<Packet> (m_input.packetSize);
WifiMode mode = WifiMode (m_input.txMode);
- m_tx->SendPacket (p, mode, WIFI_PREAMBLE_SHORT, m_input.txPowerLevel);
+ WifiTxVector txVector;
+ txVector.SetTxPowerLevel (m_input.txPowerLevel);
+ txVector.SetMode (mode);
+ m_tx->SendPacket (p, mode, WIFI_PREAMBLE_SHORT, txVector);
}
void
@@ -171,8 +175,11 @@
{
Ptr<Packet> p = Create<Packet> (m_input.packetSizeA);
p->AddByteTag (FlowIdTag (m_flowIdA));
+ WifiTxVector txVector;
+ txVector.SetTxPowerLevel (m_input.txPowerLevelA);
+ txVector.SetMode (WifiMode (m_input.txModeA));
m_txA->SendPacket (p, WifiMode (m_input.txModeA),
- WIFI_PREAMBLE_SHORT, m_input.txPowerLevelA);
+ WIFI_PREAMBLE_SHORT, txVector);
}
void
@@ -180,8 +187,11 @@
{
Ptr<Packet> p = Create<Packet> (m_input.packetSizeB);
p->AddByteTag (FlowIdTag (m_flowIdB));
+ WifiTxVector txVector;
+ txVector.SetTxPowerLevel (m_input.txPowerLevelB);
+ txVector.SetMode (WifiMode (m_input.txModeB));
m_txB->SendPacket (p, WifiMode (m_input.txModeB),
- WIFI_PREAMBLE_SHORT, m_input.txPowerLevelB);
+ WIFI_PREAMBLE_SHORT, txVector);
}
void