From 8b5a963346d3001e9efc0fc5bd93f82036128c2f Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohit.gupta@eurecom.fr>
Date: Sun, 14 Jan 2018 08:54:51 +0100
Subject: [PATCH] changes for noS1 IP addressing
---
openair2/RRC/LITE/rrc_UE.c | 7 +------
openair2/RRC/LITE/rrc_eNB.c | 5 -----
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index a75e29d3e0..67159fa248 100644
--- a/openair2/RRC/LITE/rrc_UE.c
+++ b/openair2/RRC/LITE/rrc_UE.c
@@ -730,13 +730,8 @@ rrc_ue_establish_drb(
*/
#ifdef PDCP_USE_NETLINK
# if !defined(OAI_NW_DRIVER_TYPE_ETHERNET) && !defined(EXMIMO) && !defined(OAI_USRP) && !defined(OAI_BLADERF) && !defined(ETHERNET) && !defined(LINK_ENB_PDCP_TO_GTPV1U)
-# ifdef OAI_EMU
- ip_addr_offset3 = oai_emulation.info.nb_enb_local;
- ip_addr_offset4 = NB_eNB_INST;
-# else
ip_addr_offset3 = 0;
- ip_addr_offset4 = 8;
-# endif
+ ip_addr_offset4 = 1;
LOG_I(OIP,"[UE %d] trying to bring up the OAI interface oai%d, IP 10.0.%d.%d\n", ue_mod_idP, ip_addr_offset3+ue_mod_idP,
ip_addr_offset3+ue_mod_idP+1,ip_addr_offset4+ue_mod_idP+1);
oip_ifup=nas_config(ip_addr_offset3+ue_mod_idP, // interface_id
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index b675495c98..c8b0e3390a 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -3561,12 +3561,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
ctxt_pP->module_id + 1); // fourth octet
if (oip_ifup == 0) { // interface is up --> send a config the DRB
-# ifdef OAI_EMU
- oai_emulation.info.oai_ifup[ctxt_pP->module_id] = 1;
- dest_ip_offset = NB_eNB_INST;
-# else
dest_ip_offset = 8;
-# endif
LOG_I(OIP,
"[eNB %d] Config the oai%d to send/receive pkt on DRB %ld to/from the protocol stack\n",
ctxt_pP->module_id, ctxt_pP->module_id,
--
GitLab