Revert UE changes

lib/include/srsran/mac/pdu_queue.h

@@ -38,7 +38,7 @@ public:
 
   uint8_t* request(uint32_t len);
   void     deallocate(const uint8_t* pdu);
-  void     push(const uint8_t* ptr, uint32_t len, uint32_t ue_cc_idx, channel_t channel = DCH, int ul_nof_prbs = -1);
+  void     push(const uint8_t* ptr, uint32_t len, channel_t channel = DCH, int ul_nof_prbs = -1);
 
   bool process_pdus();
 
@@ -51,7 +51,6 @@ private:
   typedef struct {
     uint8_t   ptr[MAX_PDU_LEN];
     uint32_t  len;
-    uint32_t  ue_cc_idx;
     channel_t channel;
     int       grant_nof_prbs;
 #ifdef SRSRAN_BUFFER_POOL_LOG_ENABLED

lib/src/mac/pdu_queue.cc

@@ -53,13 +53,12 @@ void pdu_queue::deallocate(const uint8_t* pdu)
  * This function enqueues the packet and returns quickly because ACK
  * deadline is important here.
  */
-void pdu_queue::push(const uint8_t* ptr, uint32_t len, uint32_t ue_cc_idx, channel_t channel, int grant_nof_prbs)
+void pdu_queue::push(const uint8_t* ptr, uint32_t len, channel_t channel, int grant_nof_prbs)
 {
   if (ptr) {
     pdu_t* pdu          = (pdu_t*)ptr;
     pdu->len            = len;
     pdu->channel        = channel;
-    pdu->ue_cc_idx      = ue_cc_idx;
     pdu->grant_nof_prbs = grant_nof_prbs;
     if (!pdu_q.try_push(pdu)) {
       logger.warning("Error pushing pdu: queue is full");

srsue/src/stack/mac/demux.cc

@@ -105,7 +105,7 @@ void demux::push_pdu_temp_crnti(uint8_t* buff, uint32_t nof_bytes)
     pending_mac_msg.reset();
     if (is_uecrid_successful) {
       Debug("Saved MAC PDU with Temporal C-RNTI in buffer");
-      pdus.push(buff, nof_bytes, 0, srsran::pdu_queue::DCH);
+      pdus.push(buff, nof_bytes, srsran::pdu_queue::DCH);
     } else {
       pdus.deallocate(buff);
     }
@@ -123,7 +123,7 @@ void demux::push_pdu(uint8_t* buff, uint32_t nof_bytes, uint32_t tti)
   // Process Real-Time PDUs
   process_sch_pdu_rt(buff, nof_bytes, tti);
 
-  return pdus.push(buff, nof_bytes, 0, srsran::pdu_queue::DCH);
+  return pdus.push(buff, nof_bytes, srsran::pdu_queue::DCH);
 }
 
 /* Demultiplexing of MAC PDU associated with SI-RNTI. The PDU passes through