diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-07-28 18:37:07 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-07-28 18:37:07 +0200 |
| commit | e211da49b98162cbf9653da7b80e30634f2b1637 (patch) | |
| tree | eb8d9954ccc3aac8436442e2c6bbb4a1564110e2 /openbsc/src/abis_nm.c | |
| parent | e51b2eaa0b9b5bfaaa3adb3c0f7ae0e567d5be10 (diff) | |
| parent | f4e79f24fcdabdfd81be5d3842b4bf4c05465db4 (diff) | |
Merge branch 'master' into proxy
Diffstat (limited to 'openbsc/src/abis_nm.c')
| -rw-r--r-- | openbsc/src/abis_nm.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c index f2383e2fa..dec4b2957 100644 --- a/openbsc/src/abis_nm.c +++ b/openbsc/src/abis_nm.c @@ -1643,7 +1643,7 @@ int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, u_int8_t chan_comb) msgb_tv_put(msg, NM_ATT_HSN, 0x00); msgb_tv_put(msg, NM_ATT_MAIO, 0x00); } - msgb_tv_put(msg, NM_ATT_TSC, 0x07); /* training sequence */ + msgb_tv_put(msg, NM_ATT_TSC, bts->tsc); /* training sequence */ if (bts->type == GSM_BTS_TYPE_BS11) msgb_tlv_put(msg, 0x59, 1, &zero); @@ -2056,10 +2056,6 @@ static int bs11_read_swl_file(struct abis_nm_bs11_sw *bs11_sw) FILE *swl; int rc = 0; - if (!tall_fle_ctx) - tall_fle_ctx = talloc_named_const(tall_bsc_ctx, 1, - "bs11_file_list_entry"); - swl = fopen(bs11_sw->swl_fname, "r"); if (!swl) return -ENODEV; @@ -2373,3 +2369,10 @@ int abis_nm_ipaccess_restart(struct gsm_bts *bts) { return __simple_cmd(bts, NM_MT_IPACC_RESTART); } + + +static __attribute__((constructor)) void on_dso_load_abis_nm(void) +{ + tall_fle_ctx = talloc_named_const(tall_bsc_ctx, 1, + "bs11_file_list_entry"); +} |