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

removed all 'wilson' and 'ASTRI' words from comments

Browse Source 
Conflicts:
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/RLC/rlc_rrc.c
This commit is contained in:
Wilson W.K. Thong
2016-09-19 11:53:55 +08:00
parent 19c81e741e
commit 6feb848ebe
15 changed files with 23 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LITE/defs.h
+1 -3
View File
@@ -506,9 +506,7 @@ 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
rb_id_t *defaultDRB; // remember the ID of the default DRB
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
-3
View File
@@ -1201,7 +1201,6 @@ 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
@@ -1210,8 +1209,6 @@ rrc_ue_process_radioResourceConfigDedicated(
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)