diff options
| author | Harald Welte <laforge@netfilter.org> | 2009-10-24 09:09:05 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@netfilter.org> | 2009-10-24 10:31:28 +0200 |
| commit | 0f890b02f6e42fac6f74f786a4c194c76d8433ab (patch) | |
| tree | db025061699f31e756024e325581e06e2cc1fb22 /openbsc/src/bsc_init.c | |
| parent | 9c880c9a9bbea475f8c1af48c6a836e6ce6eb91e (diff) | |
ip.access: Use Channel Combination from config file
bsc_init.c still contained a hard-coded channel configuration,
i.e. CCCH_combined on TS0 of C0, and TCH/F on all other channels.
Now it correctly uses the value as specified in the config file.
Diffstat (limited to 'openbsc/src/bsc_init.c')
| -rw-r--r-- | openbsc/src/bsc_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/bsc_init.c b/openbsc/src/bsc_init.c index d89ab941c..1394dd89c 100644 --- a/openbsc/src/bsc_init.c +++ b/openbsc/src/bsc_init.c @@ -378,10 +378,10 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, trx = ts->trx; if (new_state->operational == 1 && new_state->availability == NM_AVSTATE_DEPENDENCY) { - if (ts->nr == 0 && trx == trx->bts->c0) - abis_nm_set_channel_attr(ts, NM_CHANC_BCCHComb); - else - abis_nm_set_channel_attr(ts, NM_CHANC_TCHFull); + patch_nm_tables(bts); + enum abis_nm_chan_comb ccomb = + abis_nm_chcomb4pchan(ts->pchan); + abis_nm_set_channel_attr(ts, ccomb); abis_nm_chg_adm_state(trx->bts, obj_class, trx->bts->bts_nr, trx->nr, ts->nr, NM_STATE_UNLOCKED); |