[MERGED] osmo-bts[master]: fix missing ~ in bit logic for lchan->si.valid in rsl_rx_sac...

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Feb 8 19:55:04 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: fix missing ~ in bit logic for lchan->si.valid in rsl_rx_sacch_inf_mod()
......................................................................


fix missing ~ in bit logic for lchan->si.valid in rsl_rx_sacch_inf_mod()

Upon rx of a SACCH INFO Modify for an lchan that has no L3 INFO IE, clear only
the si.valid bit in question, instead of clearing all but the one in question.

BTW, It first looked like it could be, but is *not* the cause for OS#1945
(SI5ter never sent to MS).

Change-Id: I0df20b6643b0bfd219ce1df594075838d8406719
---
M src/common/rsl.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 5c4e4ff..7ab43cd 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1345,7 +1345,7 @@
 			gsm_lchan_name(lchan),
 			get_value_string(osmo_sitype_strs, osmo_si));
 	} else {
-		lchan->si.valid &= (1 << osmo_si);
+		lchan->si.valid &= ~(1 << osmo_si);
 		LOGP(DRSL, LOGL_INFO, "%s Rx RSL Disabling SACCH FILLING (SI%s)\n",
 			gsm_lchan_name(lchan),
 			get_value_string(osmo_sitype_strs, osmo_si));

-- 
To view, visit https://gerrit.osmocom.org/1777
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0df20b6643b0bfd219ce1df594075838d8406719
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list