From cf1e9d58a8a4b622c780e0032835ad0a3cfff697 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 30 Apr 2015 09:46:34 +0000
Subject: [PATCH] Sebastian Held patches15/0037-fixed-compiler-warnings.patch
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7339 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.c | 16 ++++++++--------
openair2/RRC/LITE/rrc_eNB.c | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.c b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.c
index 861063194de..b1aa0868646 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/sap/emm_sap.c
@@ -115,26 +115,26 @@ int emm_sap_send(emm_sap_t *msg)
LOG_FUNC_IN;
/* Check the EMM-SAP primitive */
- if ( (primitive > EMMREG_PRIMITIVE_MIN) &&
- (primitive < EMMREG_PRIMITIVE_MAX) ) {
+ if ( (primitive > (emm_primitive_t)EMMREG_PRIMITIVE_MIN) &&
+ (primitive < (emm_primitive_t)EMMREG_PRIMITIVE_MAX) ) {
/* Forward to the EMMREG-SAP */
msg->u.emm_reg.primitive = primitive;
rc = emm_reg_send(&msg->u.emm_reg);
- } else if ( (primitive > EMMESM_PRIMITIVE_MIN) &&
- (primitive < EMMESM_PRIMITIVE_MAX) ) {
+ } else if ( (primitive > (emm_primitive_t)EMMESM_PRIMITIVE_MIN) &&
+ (primitive < (emm_primitive_t)EMMESM_PRIMITIVE_MAX) ) {
/* Forward to the EMMESM-SAP */
msg->u.emm_esm.primitive = primitive;
rc = emm_esm_send(&msg->u.emm_esm);
- } else if ( (primitive > EMMAS_PRIMITIVE_MIN) &&
- (primitive < EMMAS_PRIMITIVE_MAX) ) {
+ } else if ( (primitive > (emm_primitive_t)EMMAS_PRIMITIVE_MIN) &&
+ (primitive < (emm_primitive_t)EMMAS_PRIMITIVE_MAX) ) {
/* Forward to the EMMAS-SAP */
msg->u.emm_as.primitive = primitive;
rc = emm_as_send(&msg->u.emm_as);
}
#if defined(NAS_BUILT_IN_EPC)
- else if ( (primitive > EMMCN_PRIMITIVE_MIN) &&
- (primitive < EMMCN_PRIMITIVE_MAX) ) {
+ else if ( (primitive > (emm_primitive_t)EMMCN_PRIMITIVE_MIN) &&
+ (primitive < (emm_primitive_t)EMMCN_PRIMITIVE_MAX) ) {
/* Forward to the EMMCN-SAP */
msg->u.emm_cn.primitive = primitive;
rc = emm_cn_send(&msg->u.emm_cn);
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 7d40310fb90..d473478aa3b 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1498,9 +1498,9 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
/* TODO parameters yet to process ... */
{
- ue_context_pP->ue_context.e_rab[i].param.qos;
- ue_context_pP->ue_context.e_rab[i].param.sgw_addr;
- ue_context_pP->ue_context.e_rab[i].param.gtp_teid;
+// ue_context_pP->ue_context.e_rab[i].param.qos;
+// ue_context_pP->ue_context.e_rab[i].param.sgw_addr;
+// ue_context_pP->ue_context.e_rab[i].param.gtp_teid;
}
/* TODO should test if e RAB are Ok before! */
--
GitLab