diff options
author | Alexander Couzens <lynxis@fe80.eu> | 2017-02-04 06:01:00 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-02-07 00:41:32 +0000 |
commit | 2b5fb8ed66feaea181b8882ec31b67f606e5ab4f (patch) | |
tree | 2f75eccb98317eb912a6eee108de59a913d85be7 | |
parent | 4f8da6dfd56a936151fd9d7c647152333c6def1a (diff) |
gprs/sgsn: rename sgsn_mm_ctx_alloc() -> sgsn_mm_ctx_alloc_gb()
Postfix the ran type to clarify the purpose.
Because of the new support of the Iu ran type, there are 2 functions to allocate a mm ctx.
For Iu it's sgsn_mm_ctx_alloc_iu(). For gb it should be named in the same way.
Change-Id: Ic49009e8c20c12308855e1409c09004698c79b95
-rw-r--r-- | openbsc/include/openbsc/gprs_sgsn.h | 2 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_gmm.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sgsn.c | 4 | ||||
-rw-r--r-- | openbsc/tests/sgsn/sgsn_test.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index f50de1115..2cc5b0c7e 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -244,7 +244,7 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli_and_ptmsi(uint32_t tlli, const struct gprs_ra_id *raid); /* Allocate a new SGSN MM context */ -struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t tlli, +struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli, const struct gprs_ra_id *raid); struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_iu(void *uectx); diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 9ac10778f..db272766a 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -1146,7 +1146,7 @@ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, if (msg->dst) ctx = sgsn_mm_ctx_alloc_iu(msg->dst); else - ctx = sgsn_mm_ctx_alloc(0, &ra_id); + ctx = sgsn_mm_ctx_alloc_gb(0, &ra_id); if (!ctx) { reject_cause = GMM_CAUSE_NET_FAIL; goto rejected; @@ -1172,7 +1172,7 @@ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, if (msg->dst) ctx = sgsn_mm_ctx_alloc_iu(msg->dst); else - ctx = sgsn_mm_ctx_alloc(msgb_tlli(msg), &ra_id); + ctx = sgsn_mm_ctx_alloc_gb(msgb_tlli(msg), &ra_id); ctx->p_tmsi = tmsi; } if (ctx->ran_type == MM_CTX_T_GERAN_Gb) { diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c index 3fb11045b..6d49e1933 100644 --- a/openbsc/src/gprs/gprs_sgsn.c +++ b/openbsc/src/gprs/gprs_sgsn.c @@ -209,8 +209,8 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_by_imsi(const char *imsi) } -/* Allocate a new SGSN MM context */ -struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t tlli, +/* Allocate a new SGSN MM context for GERAN_Gb */ +struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli, const struct gprs_ra_id *raid) { struct sgsn_mm_ctx *ctx; diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c index bcda9a007..0aa142ff9 100644 --- a/openbsc/tests/sgsn/sgsn_test.c +++ b/openbsc/tests/sgsn/sgsn_test.c @@ -190,7 +190,7 @@ static struct sgsn_mm_ctx *alloc_mm_ctx(uint32_t tlli, struct gprs_ra_id *raid) int old_count = count(gprs_llme_list()); lle = gprs_lle_get_or_create(tlli, 3); - ctx = sgsn_mm_ctx_alloc(tlli, raid); + ctx = sgsn_mm_ctx_alloc_gb(tlli, raid); ctx->gmm_state = GMM_REGISTERED_NORMAL; ctx->gb.llme = lle->llme; |