Remove unused fields of DRB

openair2/RRC/NR/nr_rrc_defs.h

@@ -202,11 +202,7 @@ typedef struct f1u_tunnel_s {
 
 typedef struct drb_s {
   int status;
-  int defaultDRBid;
   int drb_id;
-  int reestablishPDCP;
-  int recoverPDCP;
-  int daps_Config_r16;
   struct cnAssociation_s {
     int present;
     int eps_BearerIdentity;

openair2/RRC/NR/rrc_gNB.c

@@ -345,7 +345,6 @@ static NR_DRB_ToAddModList_t *createDRBlist(gNB_RRC_UE_t *ue, bool reestablish)
     if (ue->established_drbs[i].status != DRB_INACTIVE) {
       DRB_config = generateDRB_ASN1(&ue->established_drbs[i]);
       if (reestablish) {
-        ue->established_drbs[i].reestablishPDCP = NR_DRB_ToAddMod__reestablishPDCP_true;
         asn1cCallocOne(DRB_config->reestablishPDCP, NR_DRB_ToAddMod__reestablishPDCP_true);
       }
       asn1cSeqAdd(&DRB_configList->list, DRB_config);

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -96,10 +96,7 @@ drb_t *generateDRB(gNB_RRC_UE_t *ue,
 
   est_drb->status = DRB_ACTIVE;
   est_drb->drb_id = drb_id;
-  est_drb->reestablishPDCP = -1;
-  est_drb->recoverPDCP = -1;
   est_drb->cnAssociation.sdap_config.defaultDRB = true;
-  est_drb->defaultDRBid = drb_id;
 
   /* SDAP Configuration */
   est_drb->cnAssociation.present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;