jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email )

(

5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Fix unset sapi in gsm48_rr_data_ind() ......................................................................

Fix unset sapi in gsm48_rr_data_ind()

The gsm48_rr_hdr is pushed into the message before sending data to MM layer. SAPI was not set in this header.

Change-Id: I8345a562050d52d491f3b7192c979d455a63931c --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 15 insertions(+), 0 deletions(-)

Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve

diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 0815777..df762d8 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -4727,6 +4727,8 @@ /* 3.4.2 data from layer 2 to RR and upper layer*/ static int gsm48_rr_data_ind(struct osmocom_ms *ms, struct msgb *msg) { + struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); + uint8_t sapi = rllh->link_id & 7; struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_rr_hdr *rrh; uint8_t pdisc = gh->proto_discr & 0x0f; @@ -4792,6 +4794,7 @@ msgb_push(msg, sizeof(struct gsm48_rr_hdr)); rrh = (struct gsm48_rr_hdr *)msg->data; rrh->msg_type = GSM48_RR_DATA_IND; + rrh->sapi = sapi;

return gsm48_rr_upmsg(ms, msg); }