From 4c352d887e650db932706e7f76d62bf1b3140bd5 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Wed, 5 Dec 2012 13:43:21 +0100
Subject: [PATCH] reestablish DRBs at UE upon handover

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

diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc
index e4751157d..78cd3f349 100644
--- a/src/lte/model/lte-ue-mac.cc
+++ b/src/lte/model/lte-ue-mac.cc
@@ -283,7 +283,7 @@ LteUeMac::DoTransmitPdu (LteMacSapProvider::TransmitPduParameters params)
 void
 LteUeMac::DoReportBufferStatus (LteMacSapProvider::ReportBufferStatusParameters params)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << (uint32_t) params.lcid);
   
   std::map <uint8_t, uint64_t>::iterator it;
   
diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc
index ad1ef6e46..73cb017c4 100644
--- a/src/lte/model/lte-ue-rrc.cc
+++ b/src/lte/model/lte-ue-rrc.cc
@@ -616,6 +616,7 @@ LteUeRrc::DoRecvRrcConnectionReconfiguration (LteRrcSap::RrcConnectionReconfigur
           m_lastRrcTransactionIdentifier = msg.rrcTransactionIdentifier;
           NS_ASSERT (msg.haveRadioResourceConfigDedicated);
           m_srb1 = 0; // dispose SRB1
+          m_drbMap.clear (); // dispose all DRBs
           ApplyRadioResourceConfigDedicated (msg.radioResourceConfigDedicated);          
           // RRC connection reconfiguration completed will be sent
           // after handover is complete