maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed hard-code DRB-ID<->LC-ID mapping (DRB-ID = LC-ID - 2) so they are not fully configurable

Browse Source 
fixed hard-code default DRB-ID (1) so it is now fully configurable

(cherry picked from commit 4499124853b8985c3f157721997125370f1ca475)

Conflicts:
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

Conflicts:
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
This commit is contained in:
Wilson W.K. Thong
2016-09-19 11:53:55 +08:00
parent 12a304e65c
commit 19c81e741e
19 changed files with 323 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LITE/defs.h
+3
View File
@@ -506,6 +506,9 @@ typedef struct UE_RRC_INST_s {
struct SRB_ToAddMod *SRB1_config[NB_CNX_UE];
struct SRB_ToAddMod *SRB2_config[NB_CNX_UE];
struct DRB_ToAddMod *DRB_config[NB_CNX_UE][8];
#ifndef ASTRI_FIX
rb_id_t *defaultDRB; // 2015-05-27 wilson : remember the default DRB ID
#endif
MeasObjectToAddMod_t *MeasObj[NB_CNX_UE][MAX_MEAS_OBJ];
struct ReportConfigToAddMod *ReportConfig[NB_CNX_UE][MAX_MEAS_CONFIG];
struct QuantityConfig *QuantityConfig[NB_CNX_UE];
openair2/RRC/LITE/rrc_UE.c
+17 -5
View File
@@ -1060,7 +1060,7 @@ rrc_ue_process_radioResourceConfigDedicated(
#ifdef Rel10
,(PMCH_InfoList_r9_t *)NULL
#endif
);
,NULL);
// Refresh SRBs
rrc_rlc_config_asn1_req(ctxt_pP,
@@ -1200,6 +1200,18 @@ rrc_ue_process_radioResourceConfigDedicated(
// Establish DRBs if present
if (radioResourceConfigDedicated->drb_ToAddModList) {
#ifndef ASTRI_FIX // 2016-05-28 wilson : remember the default DRB ID
if ( (UE_rrc_inst[ctxt_pP->module_id].defaultDRB == NULL) &&
(radioResourceConfigDedicated->drb_ToAddModList->list.count >= 1) ) {
// configure the first DRB ID as the default DRB ID
UE_rrc_inst[ctxt_pP->module_id].defaultDRB = malloc(sizeof(rb_id_t));
*UE_rrc_inst[ctxt_pP->module_id].defaultDRB = radioResourceConfigDedicated->drb_ToAddModList->list.array[0]->drb_Identity;
LOG_I(RRC,"[UE %d] default DRB = %d\n",ctxt_pP->module_id, *UE_rrc_inst[ctxt_pP->module_id].defaultDRB);
}
#endif
uint8_t *kUPenc = NULL;
#if defined(ENABLE_SECURITY)
@@ -1231,7 +1243,7 @@ rrc_ue_process_radioResourceConfigDedicated(
#ifdef Rel10
,(PMCH_InfoList_r9_t *)NULL
#endif
);
, UE_rrc_inst[ctxt_pP->module_id].defaultDRB);
// Refresh DRBs
rrc_rlc_config_asn1_req(ctxt_pP,
@@ -1725,7 +1737,7 @@ rrc_ue_process_mobilityControlInfo(
#ifdef Rel10
,NULL
#endif
);
,NULL);
rrc_rlc_config_asn1_req(NB_eNB_INST+ue_mod_idP, frameP,0,eNB_index,
NULL,// SRB_ToAddModList
@@ -1734,7 +1746,7 @@ rrc_ue_process_mobilityControlInfo(
#ifdef Rel10
,NULL
#endif
);
,NULL);
*/
@@ -3906,7 +3918,7 @@ static void decode_MBSFNAreaConfiguration( module_id_t ue_mod_idP, uint8_t eNB_i
#ifdef Rel10
,&(UE_rrc_inst[ue_mod_idP].mcch_message[eNB_index]->pmch_InfoList_r9)
#endif
);
,NULL);
rrc_rlc_config_asn1_req(&ctxt,
NULL,// SRB_ToAddModList
openair2/RRC/LITE/rrc_eNB.c
+4 -4
View File
@@ -481,7 +481,7 @@ static void init_MBMS(
# ifdef Rel10
, &(eNB_rrc_inst[enb_mod_idP].carrier[CC_id].mcch_message->pmch_InfoList_r9)
# endif
);
,NULL);
rrc_rlc_config_asn1_req(&ctxt,
NULL, // SRB_ToAddModList
@@ -3282,7 +3282,7 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
#ifdef Rel10
, (PMCH_InfoList_r9_t *) NULL
#endif
);
,NULL);
rrc_rlc_config_asn1_req(&ctxt,
ue_context_pP->ue_context.SRB_configList,
@@ -3524,7 +3524,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
#ifdef Rel10
, (PMCH_InfoList_r9_t *) NULL
#endif
);
,NULL);
// Refresh SRBs/DRBs
rrc_rlc_config_asn1_req(
ctxt_pP,
@@ -4336,7 +4336,7 @@ rrc_eNB_decode_ccch(
# ifdef Rel10
, (PMCH_InfoList_r9_t *) NULL
# endif
);
,NULL);
rrc_rlc_config_asn1_req(ctxt_pP,
ue_context_p->ue_context.SRB_configList,