Merge commit 'origin/master' into on-waves/bsc-master

Conflicts:
	openbsc/include/openbsc/Makefile.am
	openbsc/include/openbsc/gsm_data.h
	openbsc/src/Makefile.am
	openbsc/src/abis_rsl.c
	openbsc/src/chan_alloc.c
	openbsc/src/gsm_04_08.c
	openbsc/src/gsm_data.c
	openbsc/src/vty_interface.c

The biggest problem is the moving of the RTP code into
the RSL layer. This may break quite some things...

1 files changed, 25 insertions, 1 deletions

diff --git a/openbsc/src/transaction.c b/openbsc/src/transaction.c
index 03735d4a4..2f5681433 100644
--- a/openbsc/src/transaction.c
+++ b/openbsc/src/transaction.c
@@ -134,10 +134,34 @@ int trans_assign_trans_id(struct gsm_subscriber *subscr,
 		used_tid_bitmask |= (1 << trans->transaction_id);
 	}
 
-	for (i = 0; i <= 7; i++) {
+	for (i = 0; i < 7; i++) {
 		if ((used_tid_bitmask & (1 << (i | ti_flag))) == 0)
 			return i | ti_flag;
 	}
 
 	return -1;
 }
+
+/* update all transactions to use a different LCHAN, e.g.
+ * after handover has succeeded */
+int trans_lchan_change(struct gsm_lchan *lchan_old,
+		       struct gsm_lchan *lchan_new)
+{
+	struct gsm_network *net = lchan_old->ts->trx->bts->network;
+	struct gsm_trans *trans;
+	int num = 0;
+
+	llist_for_each_entry(trans, &net->trans_list, entry) {
+		if (trans->lchan == lchan_old) {
+			/* drop old channel use cound */
+			put_lchan(trans->lchan);
+			/* assign new channel */
+			trans->lchan = lchan_new;
+			/* bump new channel use count */
+			use_lchan(trans->lchan);
+			num++;
+		}
+	}
+
+	return num;
+}