[MERGED] osmo-bts[master]: dyn PDCH: safeguard: exit if nothing pending in dyn_pdch_ts_...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Jun 22 23:31:06 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: dyn PDCH: safeguard: exit if nothing pending in dyn_pdch_ts_disconnected()
......................................................................


dyn PDCH: safeguard: exit if nothing pending in dyn_pdch_ts_disconnected()

The function would currently only be called in cases where one of the if
branches catches on, but for safety's and clarity's sake, don't ts_connect
using as_pchan if no reconnect is pending.

Change-Id: I52c34065254e902bb80662fc04540901b36cb4c3
---
M src/common/rsl.c
1 file changed, 3 insertions(+), 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 cf6cef8..674ce87 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1791,7 +1791,9 @@
 		     gsm_lchan_name(ts->lchan));
 		ts->lchan[0].type = GSM_LCHAN_PDTCH;
 		as_pchan = GSM_PCHAN_PDCH;
-	}
+	} else
+		/* No reconnect pending. */
+		return;
 
 	rc = bts_model_ts_connect(ts, as_pchan);
 	/* Error? then NACK right now. */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52c34065254e902bb80662fc04540901b36cb4c3
Gerrit-PatchSet: 2
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