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

Fixed broken UL for data plane split

Browse Source
This commit is contained in:
Nikos Makris
2016-10-04 18:59:01 +03:00
parent 9f3b8cb9f8
commit 2a4fa1da41
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+3 -8
View File
@@ -368,15 +368,9 @@ boolean_t pdcp_data_req(
#endif #endif
//starting async
// const Enb_properties_array_t *enb_properties_p = NULL;
Enb_properties_array_t *enb_properties_p = NULL;
// enb_properties_p = malloc(sizeof(Enb_properties_array_t));
// memset(enb_properties_p, 0, sizeof(Enb_properties_array_t));
// printf("starting the client\n\n");
// printf("Starting the async client\n"); Enb_properties_array_t *enb_properties_p = NULL;
// new_thread(proto_server_start, NULL);
enb_properties_p = enb_config_get(); enb_properties_p = enb_config_get();
static int agent_started = 1; static int agent_started = 1;
@@ -407,6 +401,7 @@ boolean_t pdcp_data_req(
} }
else else
{ {
// It should never get here
rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p); rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
} }
} }
openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
+1 -1
View File
@@ -437,7 +437,7 @@ int proto_agent_pdcp_data_ind(mid_t mod_id, const void *params, Protocol__Flexsp
printf("MSG payload is %u", args->sdu_size); printf("MSG payload is %u", args->sdu_size);
//memcpy(pdu->fsp_pdu_data.data, args->sdu_p, args->sdu_size); memcpy(pdu->fsp_pdu_data.data, args->sdu_p, args->sdu_size);
pdu->has_fsp_pdu_data = 1; pdu->has_fsp_pdu_data = 1;
// Copy data to the ctxt structure // Copy data to the ctxt structure
openair2/LAYER2/RLC/rlc.c
+13 -13
View File
@@ -653,25 +653,25 @@ void rlc_data_ind (
T(T_ENB_RLC_UL, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->rnti), T_INT(rb_idP), T_INT(sdu_sizeP)); T(T_ENB_RLC_UL, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->rnti), T_INT(rb_idP), T_INT(sdu_sizeP));
#endif #endif
if (!srb_flagP) // if (!srb_flagP)
{ // {
proto_agent_send_pdcp_data_ind(ctxt_pP, proto_agent_send_pdcp_data_ind(ctxt_pP,
srb_flagP, srb_flagP,
MBMS_flagP, MBMS_flagP,
rb_idP, rb_idP,
sdu_sizeP, sdu_sizeP,
sdu_pP); sdu_pP);
} // }
else // else
{ // {
pdcp_data_ind ( // pdcp_data_ind (
ctxt_pP, // ctxt_pP,
srb_flagP, // srb_flagP,
MBMS_flagP, // MBMS_flagP,
rb_idP, // rb_idP,
sdu_sizeP, // sdu_sizeP,
sdu_pP); // sdu_pP);
} // }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void rlc_data_conf (const protocol_ctxt_t* const ctxt_pP, void rlc_data_conf (const protocol_ctxt_t* const ctxt_pP,