diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index d232e3178..e4b070fb2 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -431,6 +431,7 @@ LteEnbMac::DoSubframeIndication (uint32_t frameNo, uint32_t subframeNo) // Get downlink transmission opportunities FfMacSchedSapProvider::SchedDlTriggerReqParameters params; // to be filled + params.m_sfnSf = ((0xFF & frameNo) << 4) | (0xF & subframeNo); m_schedSapProvider->SchedDlTriggerReq (params); diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index 1648d95de..a80759bf2 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -114,7 +114,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) NodeContainer enbNodes; NodeContainer ueNodes; enbNodes.Create (1); - m_nUser = 8; + m_nUser = 6; ueNodes.Create (m_nUser); // Install Mobility Model @@ -144,7 +144,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) mm->SetPosition (Vector (m_dist, 0.0, 0.0)); lena->EnableRlcTraces (); - double simulationTime = 0.020; + double simulationTime = 0.040; Simulator::Stop (Seconds (simulationTime)); Ptr rlcStats = lena->GetRlcStats (); diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.h b/src/lte/test/lte-test-rr-ff-mac-scheduler.h index a4a7d906d..ddbc4769d 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.h @@ -40,11 +40,16 @@ using namespace ns3; class LenaRrFfMacSchedulerTestCase : public TestCase { public: - LenaRrFfMacSchedulerTestCase (); + LenaRrFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRef); virtual ~LenaRrFfMacSchedulerTestCase (); private: virtual void DoRun (void); + uint16_t m_nUser; + uint16_t m_nLc; + uint16_t m_dist; + double m_thrRef; + };