[PATCH] osmo-bts[master]: l1sap: fix missing 'else's causing wrong rach frame expiry c...

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Mon Jan 16 23:38:53 UTC 2017


Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/1614

to look at the new patch set (#2).

l1sap: fix missing 'else's causing wrong rach frame expiry counts

This bug was introduced in the recently merged
commit 1e399f888e4e1c93e0e5b7fd69fce09a2587fb87
aka change-id I87f40f5f160a4f6750c4f3d06997fc4f24049303

Fixes: coverity-scan CID#160156 and CID#160155
Change-Id: I88ed1b3e59213acdf97f88eda097b8172b952a5e
---
M src/common/l1sap.c
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/1614/2

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 0ce1e4a..9116e23 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -381,9 +381,9 @@
 		 * See also TS 04.08, Chapter 10.5.2.11, table 10.29 */
 		if (ccch_conf == RSL_BCCH_CCCH_CONF_2_NC)
 			rach_frames_expired = 2;
-		if (ccch_conf == RSL_BCCH_CCCH_CONF_3_NC)
+		else if (ccch_conf == RSL_BCCH_CCCH_CONF_3_NC)
 			rach_frames_expired = 3;
-		if (ccch_conf == RSL_BCCH_CCCH_CONF_4_NC)
+		else if (ccch_conf == RSL_BCCH_CCCH_CONF_4_NC)
 			rach_frames_expired = 4;
 		else
 			rach_frames_expired = 1;

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I88ed1b3e59213acdf97f88eda097b8172b952a5e
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list