[S] Change in libosmo-gprs[master]: Fix typo LLGM -> LLGMM

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 ) Change subject: Fix typo LLGM -> LLGMM ...................................................................... Fix typo LLGM -> LLGMM The interface name is LLGMM, as presented in TS 44.06 7.1.0 and TS 24.007 Change-Id: I59577d27bedd26903c9b1bfc64792f0891cea728 --- M include/osmocom/gprs/llc/llc_prim.h M src/gmm/gmm_prim.c M src/llc/llc_llgmm.c M src/llc/llc_prim.c M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.ok M tests/llc/llc_prim_test.c M tests/llc/llc_prim_test.err 8 files changed, 28 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 1a317e1..66b8a2a 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -12,7 +12,7 @@ /* Section 7.1.0 */ enum osmo_gprs_llc_prim_sap { - OSMO_GPRS_LLC_SAP_LLGM, + OSMO_GPRS_LLC_SAP_LLGMM, OSMO_GPRS_LLC_SAP_LL, OSMO_GPRS_LLC_SAP_GRR, OSMO_GPRS_LLC_SAP_BSSGP, diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index ce7afb2..9888e50 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -643,7 +643,7 @@ LOGGMM(LOGL_INFO, "Rx from lower layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: rc = gprs_gmm_prim_handle_llgmm(llc_prim); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index b099a6a..9797456 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -79,7 +79,7 @@ enum osmo_prim_operation operation, unsigned int l3_len) { - return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LLGM, type, operation, l3_len); + return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LLGMM, type, operation, l3_len); } /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ diff --git a/src/llc/llc_prim.c b/src/llc/llc_prim.c index fd3578e..d653f03 100644 --- a/src/llc/llc_prim.c +++ b/src/llc/llc_prim.c @@ -33,7 +33,7 @@ #define LLC_MSGB_HEADROOM 0 const struct value_string osmo_gprs_llc_prim_sap_names[] = { - { OSMO_GPRS_LLC_SAP_LLGM, "LLGM" }, + { OSMO_GPRS_LLC_SAP_LLGMM, "LLGMM" }, { OSMO_GPRS_LLC_SAP_LL, "LL" }, { OSMO_GPRS_LLC_SAP_GRR, "GRR" }, { OSMO_GPRS_LLC_SAP_BSSGP, "BSSGP" }, @@ -48,7 +48,7 @@ const char *type; switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: type = osmo_gprs_llc_llgmm_prim_type_name(llc_prim->oph.primitive); break; case OSMO_GPRS_LLC_SAP_LL: @@ -157,7 +157,7 @@ LOGLLC(LOGL_INFO, "Rx from upper layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: rc = gprs_llc_prim_llgmm_upper_down(llc_prim); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_test.c index 0053b94..fa300d4 100644 --- a/tests/gmm/gmm_prim_test.c +++ b/tests/gmm/gmm_prim_test.c @@ -204,7 +204,7 @@ const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_test.ok index dbbb858..12afb40 100644 --- a/tests/gmm/gmm_prim_test.ok +++ b/tests/gmm/gmm_prim_test.ok @@ -2,21 +2,21 @@ test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 01 04 97 07 00 00 01 0a 00 05 f4 00 00 00 00 00 f0 00 00 00 00 00 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 16 08 42 32 24 43 32 24 43 f2 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 13 02 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request new_tlli=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 03 ] test_gmm_prim_up_cb(): Rx GMMREG-ATTACH.confirm accepted=1 rej_cause=0 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 05 20 0a 00 05 f4 ea 71 1b 41 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_up_cb(): Rx GMMREG-DETACH.confirm detach_type='GPRS detach' ==== test_gmm_prim_ms_gmmreg() [end] ==== ==== test_gmm_prim_ms_gmmsm() [start] ==== test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 01 04 97 07 00 00 01 0a 00 05 f4 00 00 00 00 00 f0 00 00 00 00 00 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 16 08 42 32 24 43 32 24 43 f2 ] test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0x00000000 SAPI=GMM l3=[08 13 02 ] -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 -test_gmm_prim_llc_down_cb(): Rx LLGM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 +test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request new_tlli=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 03 ] test_gmm_prim_up_cb(): Rx GMMSM-ESTABLISH.confirm sess_id=1234 accepted=1 rej_cause=0 diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 3e3dc82..83a7556 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -44,7 +44,7 @@ const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); switch (llc_prim->oph.sap) { - case OSMO_GPRS_LLC_SAP_LLGM: + case OSMO_GPRS_LLC_SAP_LLGMM: printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; case OSMO_GPRS_LLC_SAP_LL: diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err index 2c38469..667b423 100644 --- a/tests/llc/llc_prim_test.err +++ b/tests/llc/llc_prim_test.err @@ -8,11 +8,11 @@ DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLC RX: unknown TLLI 0xe1c5d364, creating LLME on the fly DLGLOBAL DEBUG LLE(ffffffff/e1c5d364,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request -DLGLOBAL INFO Rx from upper layers: LLGM-ASSIGN.request +DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364 => e1c5d364) DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364 => e1c5d364) -DLGLOBAL INFO Rx from upper layers: LLGM-RESET.request -DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM-RESET.request +DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request +DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request DLGLOBAL INFO Rx from upper layers: LL-XID.request DLGLOBAL NOTICE LLE(e1c5d364/e1c5d364,SNDCP3){UNASSIGNED} Sending XID type L3-Params (30 bytes) request to MS... DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I59577d27bedd26903c9b1bfc64792f0891cea728 Gerrit-Change-Number: 32156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged