pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32996 ) Change subject: Fix typo llgm -> llgmm everywhere ...................................................................... Fix typo llgm -> llgmm everywhere Change-Id: Ic9cd63a6086526efdbd9184729bfae4b1cea56c1 --- M include/osmocom/gprs/llc/llc_prim.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/llc/llc_llgmm.c M tests/llc/llc_prim_test.c 5 files changed, 33 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/96/32996/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 904e9fa..d675954 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -298,11 +298,11 @@ const char *osmo_gprs_llc_prim_name(const struct osmo_gprs_llc_prim *llc_prim); /* Alloc primitive for LLGMM SAP: */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_trigger_req(uint32_t tlli, uint8_t cause); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_suspend_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_resume_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_assign_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_trigger_req(uint32_t tlli, uint8_t cause); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_suspend_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_resume_req(uint32_t tlli); /* Alloc primitive for LL SAP: */ struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_establish_req(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 38ebc98..f59147b 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -469,7 +469,7 @@ struct osmo_gprs_llc_prim *llc_prim_tx; int rc; - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_assign_req(gmme->old_tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_assign_req(gmme->old_tlli); llc_prim_tx->llgmm.assign_req.tlli_new = gmme->tlli; llc_prim_tx->llgmm.assign_req.gea = gmme->auth_ciph.gea; memcpy(llc_prim_tx->llgmm.assign_req.kc, gmme->auth_ciph.kc, ARRAY_SIZE(gmme->auth_ciph.kc)); diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index a6714ff..95e421b 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -191,7 +191,7 @@ break; case GPRS_GMM_MS_EV_RAU_REQUESTED: /* TS 24.007 C.15: submit LLGMM-SUSPEND-REQ */ - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_suspend_req(ctx->gmme->tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_suspend_req(ctx->gmme->tlli); OSMO_ASSERT(llc_prim_tx); rc = gprs_gmm_prim_call_llc_down_cb(llc_prim_tx); /* Transmit RAU Requested to SGSN: */ @@ -238,7 +238,7 @@ break; case GPRS_GMM_MS_EV_RAU_ACCEPTED: /* TS 24.007 C.15: submit LLGM-RESUME-REQ */ - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_resume_req(ctx->gmme->tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_resume_req(ctx->gmme->tlli); OSMO_ASSERT(llc_prim_tx); gprs_gmm_prim_call_llc_down_cb(llc_prim_tx); gmm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_REGISTERED); diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index 7b09a69..bf161e3 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -83,7 +83,7 @@ } /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_assign_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST, 0); @@ -92,7 +92,7 @@ } /* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST, 0); @@ -101,7 +101,7 @@ } /* 7.2.1.2 LLGMM-RESET.cnf (SGSN): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_cnf(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_cnf(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_CONFIRM, 0); @@ -110,7 +110,7 @@ } /* 7.2.1.3 LLGMM-TRIGGER.req (MS): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_trigger_req(uint32_t tlli, uint8_t cause) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_trigger_req(uint32_t tlli, uint8_t cause) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST, 0); @@ -120,7 +120,7 @@ } /* 7.2.1.4 LLGMM-SUSPEND.req (MS/SGSN): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_suspend_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_suspend_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST, 0); @@ -129,7 +129,7 @@ } /* 7.2.1.5 LLGMM-RESUME.req (MS/SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_resume_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_resume_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESUME, PRIM_OP_REQUEST, 0); @@ -142,7 +142,7 @@ ********************************/ /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_assign_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_assign_req(struct osmo_gprs_llc_prim *llc_prim) { uint32_t old_tlli = llc_prim->llgmm.tlli; uint32_t new_tlli = llc_prim->llgmm.assign_req.tlli_new; @@ -228,7 +228,7 @@ } /* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ -static int llc_prim_handle_llgm_reset_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_reset_req(struct osmo_gprs_llc_prim *llc_prim) { struct gprs_llc_lle *lle; uint8_t xid_bytes[1024]; @@ -275,7 +275,7 @@ } /* 7.2.1.4 LLGMM-SUSPEND.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_suspend_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_suspend_req(struct osmo_gprs_llc_prim *llc_prim) { int rc = 0; struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); @@ -296,7 +296,7 @@ } /* 7.2.1.5 LLGMM-RESUME.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_resume_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_resume_req(struct osmo_gprs_llc_prim *llc_prim) { int rc = 0; struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); @@ -324,11 +324,11 @@ case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_assign_req(llc_prim); + rc = llc_prim_handle_llgmm_assign_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_reset_req(llc_prim); + rc = llc_prim_handle_llgmm_reset_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS); @@ -337,12 +337,12 @@ case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_suspend_req(llc_prim); + rc = llc_prim_handle_llgmm_suspend_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESUME, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_resume_req(llc_prim); + rc = llc_prim_handle_llgmm_resume_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_IOV, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 54dabb6..b3ff512 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -219,13 +219,13 @@ rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); - llc_prim = osmo_gprs_llc_prim_alloc_llgm_assign_req(tlli); + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_assign_req(tlli); OSMO_ASSERT(llc_prim); llc_prim->llgmm.assign_req.tlli_new = tlli; rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); - llc_prim = osmo_gprs_llc_prim_alloc_llgm_reset_req(tlli); + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_reset_req(tlli); OSMO_ASSERT(llc_prim); rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic9cd63a6086526efdbd9184729bfae4b1cea56c1 Gerrit-Change-Number: 32996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange