[S] Change in libosmo-gprs[master]: llc: use GRR instead of BSSGP to tx XID.req in MS mode

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32585 ) Change subject: llc: use GRR instead of BSSGP to tx XID.req in MS mode ...................................................................... llc: use GRR instead of BSSGP to tx XID.req in MS mode Change-Id: Ib2ada2cc7160202f9da5b177da8263076e1eef69 --- M src/llc/llc.c 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/85/32585/1 diff --git a/src/llc/llc.c b/src/llc/llc.c index ef52ec3..4be7a9a 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -266,7 +266,10 @@ gprs_llc_encode_is_cmd_as_cr(is_cmd, &pdu_dec.flags); /* LLC payload is put directly below: */ - llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) + llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + else + llc_prim = gprs_llc_prim_alloc_grr_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); msg = llc_prim->oph.msg; msg->l3h = msg->tail; @@ -276,10 +279,15 @@ msgb_free(msg); return rc; } - llc_prim->bssgp.ll_pdu = msgb_l3(msg); - llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + llc_prim->bssgp.ll_pdu = msgb_l3(msg); + llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + } else { + llc_prim->grr.ll_pdu = msgb_l3(msg); + llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + } - /* Send BSSGP-DL-UNITDATA.req */ + /* Send GRR-UNITDATA.req */ gprs_llc_prim_call_down_cb(llc_prim); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib2ada2cc7160202f9da5b177da8263076e1eef69 Gerrit-Change-Number: 32585 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange