From 1019e61beaf4e6994cfdcc7ed97774de8cbeedc5 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Wed, 4 Feb 2015 08:25:22 +0000
Subject: [PATCH] fix NAS compilation flag
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6464 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index abaeaa32c1..cec69ba3fe 100755
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -537,11 +537,11 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
(data->pdcp_read_header.traffic_type == TRAFFIC_IPV4_TYPE_UNICAST) /*TRAFFIC_IPV4_TYPE_UNICAST*/ ) {
pdcp_mode= PDCP_TRANSMISSION_MODE_DATA;
} else {
- pdcp_mode= PDCP_TRANSMISSION_MODE_DATA;
+ pd ctxt_cpy = *ctxt_pP;cp_mode= PDCP_TRANSMISSION_MODE_DATA;
LOG_W(PDCP,"unknown IP traffic type \n");
}
#else // NASMESH driver does not curreenlty support multicast traffic
- pdcp_mode = PDCP_TRANSMISSION_MODE_DATA;
+ pdcp_m ctxt_cpy = *ctxt_pP;ode = PDCP_TRANSMISSION_MODE_DATA;
#endif
pdcp_data_req(ctxt_pP,
SRB_FLAG_NO,
@@ -563,7 +563,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
LOG_D(PDCP, "eNB Try Forcing send on DEFAULT_RAB_ID first_ue_local %u nb_ue_local %u\n", oai_emulation.info.first_ue_local, oai_emulation.info.nb_ue_local);
for (ue_id = 0; ue_id < NB_UE_INST; ue_id++) {
pdcp = &pdcp_array_drb_eNB[ctxt_cpy.enb_module_id][ue_id][DEFAULT_RAB_ID-1];
- if (pdcp->instanciated_instance) {
+ if (pd ctxt_cpy = *ctxt_pP;cp->instanciated_instance) {
LOG_D(PDCP, "eNB Try Forcing send on DEFAULT_RAB_ID UE %d\n", ue_id);
ctxt.enb_module_id = ctxt_cpy.enb_module_id;
ctxt.ue_module_id = ue_id;
@@ -590,7 +590,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
RLC_MUI_UNDEFINED,
RLC_SDU_CONFIRM_NO,
data->pdcp_read_header.data_size,
- data->data,
+ data- ctxt_cpy = *ctxt_pP;>data,
PDCP_TRANSMISSION_MODE_DATA);
}
free(data->data);
@@ -601,6 +601,9 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
# else /* ENABLE_PDCP_NETLINK_FIFO*/
int len = 1;
rb_id_t rab_id = 0;
+ protocol_ctxt_t ctxt_cpy;
+ protocol_ctxt_t ctxt;
+ ctxt_cpy = *ctxt_pP;
while (len > 0) {
len = recvmsg(nas_sock_fd, &nas_msg_rx, 0);
if (len<=0) {
--
GitLab