[PATCH] openbsc[master]: dyn TS: rename lchan->dyn_pdch to lchan->dyn

[Neels Hofmeyr]

Hello Harald Welte,

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

    https://gerrit.osmocom.org/593

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

dyn TS: rename lchan->dyn_pdch to lchan->dyn

This will also be used by the new dynamic TS type, so make the name more
general.

Change-Id: I2451b10519dff3e5cdf503b430574c0984d19000
---
M openbsc/include/openbsc/gsm_data_shared.h
M openbsc/src/libbsc/abis_rsl.c
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/93/593/2

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 7241ff0..a6537f0 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -261,7 +261,7 @@
 		/* channel activation type and handover ref */
 		uint8_t act_type;
 		uint8_t ho_ref;
-	} dyn_pdch;
+	} dyn;
 #else
 	/* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23.
 	 * Currently we don't share these headers so this is a magic number. */
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 49ece5f..6b6ec0a 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -450,8 +450,8 @@
 	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
 	    && (lchan->ts->flags & TS_F_PDCH_ACTIVE)) {
 		/* store activation type and handover reference */
-		lchan->dyn_pdch.act_type = act_type;
-		lchan->dyn_pdch.ho_ref = ho_ref;
+		lchan->dyn.act_type = act_type;
+		lchan->dyn.ho_ref = ho_ref;
 		return rsl_ipacc_pdch_activate(lchan->ts, 0);
 	}
 
@@ -1262,8 +1262,8 @@
 	msg->lchan->ts->flags &= ~TS_F_PDCH_ACTIVE;
 	msg->lchan->ts->flags &= ~TS_F_PDCH_DEACT_PENDING;
 
-	rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn_pdch.act_type,
-				msg->lchan->dyn_pdch.ho_ref);
+	rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn.act_type,
+				msg->lchan->dyn.ho_ref);
 
 	return 0;
 }

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2451b10519dff3e5cdf503b430574c0984d19000
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>