From f3ddd077d962e54dfd54583e7d0bbe9bb4a26fec Mon Sep 17 00:00:00 2001
From: mmiozzo <unknown>
Date: Tue, 9 Oct 2012 17:02:40 +0200
Subject: [PATCH] Bug-fix inhibit Error Model when receiving data frame with
 only control messages in LteSpectrumPhy::EndRxData

---
 src/lte/model/lte-spectrum-phy.cc | 2 +-
 src/lte/model/lte-ue-phy.cc       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc
index 2a5d07756..d744dde1d 100644
--- a/src/lte/model/lte-spectrum-phy.cc
+++ b/src/lte/model/lte-spectrum-phy.cc
@@ -758,7 +758,7 @@ LteSpectrumPhy::EndRxData ()
   
   while (itTb!=m_expectedTbs.end ())
     {
-      if (m_dataErrorModelEnabled)
+      if ((m_dataErrorModelEnabled)&&(m_rxPacketBurstList.size ()>0)) // avoid to check for errors when there is no actual data transmitted
         {
           double errorRate = LteMiErrorModel::GetTbError (m_sinrPerceived, (*itTb).second.rbBitmap, (*itTb).second.size, (*itTb).second.mcs);
           (*itTb).second.corrupt = m_random->GetValue () > errorRate ? false : true;
diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc
index 03d7b31a3..96470fc19 100644
--- a/src/lte/model/lte-ue-phy.cc
+++ b/src/lte/model/lte-ue-phy.cc
@@ -643,6 +643,7 @@ LteUePhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo)
       // send only PUCCH (ideal: fake null bandwidth signal)
       if (ctrlMsg.size ()>0)
         {
+          NS_LOG_LOGIC (this << " UE - start TX PUCCH (NO PUSCH)");
           std::vector <int> dlRb;
           SetSubChannelsForTransmission (dlRb);
           m_uplinkSpectrumPhy->StartTxDataFrame (pb, ctrlMsg, UL_DATA_DURATION);