Merge remote-tracking branch 'origin/NR_skip_mac_pdu_processing_when_nack'...

Merge remote-tracking branch 'origin/NR_skip_mac_pdu_processing_when_nack' into integration_2021_wk35

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -3173,7 +3173,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
     LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", rx_lcid, pdu_len);
     switch(rx_lcid){
       //  MAC CE
-
       case DL_SCH_LCID_CCCH:
         //  MSG4 RRC Setup 38.331
         //  variable length
@@ -3210,7 +3209,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
           nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_sdu_len);
         }
         break;
-
       case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
 
         //  38.321 Ch6.1.3.14
@@ -3252,7 +3250,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
           mac_subheader_len = 3;
         }
         break;
-            
       case DL_SCH_LCID_RECOMMENDED_BITRATE:
         //  38.321 Ch6.1.3.20
         mac_ce_len = 2;
@@ -3342,21 +3339,16 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
             ra->RA_active = 0;
           }
         }
-
         break;
       case DL_SCH_LCID_PADDING:
         done = 1;
         //  end of MAC PDU, can ignore the rest.
         break;
-
         //  MAC SDU
-
       case DL_SCH_LCID_DCCH:
         //  check if LCID is valid at current time.
-
       case DL_SCH_LCID_DCCH1:
         //  check if LCID is valid at current time.
-
       default:
         //  check if LCID is valid at current time.
         if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
@@ -3381,7 +3373,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
           LOG_T(MAC, "\n");
         #endif
 
-//                if (IS_SOFTMODEM_NOS1){
         if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DCCH) {
 
           mac_rlc_data_ind(module_idP,
@@ -3398,7 +3389,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
         } else {
           LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index);
         }
-//                }
 
         break;
       }

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -79,13 +79,13 @@ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t
 
 // L2 Abstraction Layer
 // Note: sdu should always be processed because data and timing advance updates are transmitted by the UE
-int8_t handle_dlsch (nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
+int8_t handle_dlsch(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
 
   update_harq_status(dl_info, pdu_id);
+  if(dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.ack_nack)
     nr_ue_send_sdu(dl_info, ul_time_alignment, pdu_id);
 
   return 0;
-
 }
 
 int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){