[S] Change in libosmo-gprs[master]: llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33951 ) Change subject: llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP ...................................................................... llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP Change-Id: I962e25789849f89c532f5ede386fa029600d9901 --- M src/llc/llc.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/llc/llc.c b/src/llc/llc.c index bcd33b5..d58b454 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -279,12 +279,14 @@ msgb_free(msg); return rc; } - if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + llc_prim->grr.unitdata_req.sapi = lle->sapi; } /* Send GRR-UNITDATA.req */ @@ -319,12 +321,14 @@ msgb_free(msg); return rc; } - if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + llc_prim->grr.unitdata_req.sapi = lle->sapi; } /* Send BSSGP-DL-UNITDATA.req (SGSN) / GRR-UNITDATA.req (MS) */ @@ -384,6 +388,7 @@ if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I962e25789849f89c532f5ede386fa029600d9901 Gerrit-Change-Number: 33951 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged