Modify setting of new_sdu_p->data->inst to avoid unexpected setting in case of UE.

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -800,8 +800,10 @@ pdcp_data_ind(
 #endif
       } else {
         ((pdcp_data_ind_header_t*) new_sdu_p->data)->rb_id = rb_id + (ctxt_pP->module_id * maxDRB);
+        ((pdcp_data_ind_header_t*) new_sdu_p->data)->inst  = ctxt_pP->module_id;
       }
-      ((pdcp_data_ind_header_t*) new_sdu_p->data)->inst  = ctxt_pP->module_id;
+      // new_sdu_p->data->inst is set again in UE case so move to above.
+      //((pdcp_data_ind_header_t*) new_sdu_p->data)->inst  = ctxt_pP->module_id;
 
 #ifdef DEBUG_PDCP_FIFO_FLUSH_SDU
       static uint32_t pdcp_inst = 0;

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -168,7 +168,11 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
             ((pdcp_data_ind_header_t*) sdu_p->data)->inst,
             ((pdcp_data_ind_header_t *) sdu_p->data)->data_size);
 #else
-      ((pdcp_data_ind_header_t *)(sdu_p->data))->inst = 0;
+      // value of sdu_p->data->inst is set in pdcp_data_ind
+      // it's necessary to set 1 in case of UE with S1.
+      if (ctxt_pP->enb_flag){
+        ((pdcp_data_ind_header_t *)(sdu_p->data))->inst = 0;
+      }
 #endif
 
 #if defined(LINK_ENB_PDCP_TO_GTPV1U)