diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-23 21:00:51 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-28 11:55:03 +0200 |
| commit | 6e999b75fa3881540e0426f01c9f80b8953ec33c (patch) | |
| tree | 79aeee7a4384f5312ff6126781689defc04e94f8 | |
| parent | cf7933892a995db7c02a3421df90c84556c38776 (diff) | |
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
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/abis_rsl.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 70366199e..f4da7a7ab 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -261,7 +261,7 @@ struct gsm_lchan { /* 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 b75c3f355..664b1a6a8 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -450,8 +450,8 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, 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 @@ static int rsl_rx_pdch_deact_ack(struct msgb *msg) 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; } |