Index: src/spectrum/model/half-duplex-ideal-phy.cc |
=================================================================== |
--- a/src/spectrum/model/half-duplex-ideal-phy.cc |
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc |
@@ -242,20 +242,6 @@ |
m_phyMacRxEndOkCallback = c; |
} |
-Ptr<AntennaModel> |
-HalfDuplexIdealPhy::GetRxAntenna () |
-{ |
- NS_LOG_FUNCTION (this); |
- return m_antenna; |
-} |
- |
-void |
-HalfDuplexIdealPhy::SetAntenna (Ptr<AntennaModel> a) |
-{ |
- NS_LOG_FUNCTION (this << a); |
- m_antenna = a; |
-} |
- |
void |
HalfDuplexIdealPhy::ChangeState (State newState) |
{ |
@@ -285,7 +271,8 @@ |
double txTimeSeconds = m_rate.CalculateTxTime (p->GetSize ()); |
txParams->duration = Seconds (txTimeSeconds); |
txParams->txPhy = GetObject<SpectrumPhy> (); |
- txParams->txAntenna = m_antenna; |
+ Ptr<AntennaModel> ant = txParams->txPhy->GetObject<AntennaModel> (); |
+ txParams->txAntenna = ant; |
txParams->psd = m_txPsd; |
txParams->data = m_txPacket; |