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.
This commit is contained in:
Harald Welte 2009-10-24 09:09:05 +02:00
parent 9c880c9a9b
commit 0f890b02f6
1 changed files with 4 additions and 4 deletions

View File

@ -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);