diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-07-01 11:24:18 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-07-01 11:24:18 +0200 |
| commit | 1a9913060fb846e332cd6d1f09e27967b7f58f6e (patch) | |
| tree | f0ce53be282fa48c78a048ec1bcc2f3cf0ff9b3a | |
| parent | 8dc1a6811e0af58abb56b8029a3b9e9f3fea2ca9 (diff) | |
| parent | 8226fa7016b4b3a26021b8ebf5c1fbeb5f280274 (diff) | |
Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 2 | ||||
| -rw-r--r-- | openbsc/src/bsc_hack.c | 2 | ||||
| -rw-r--r-- | openbsc/src/gsm_data.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 9b4cf9df3..af2e22c5a 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -415,7 +415,7 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, char *gsm_band_name(enum gsm_band band); enum gsm_band gsm_band_parse(int mhz); -void *tall_bsc_ctx; +extern void *tall_bsc_ctx; static inline int is_ipaccess_bts(struct gsm_bts *bts) { diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c index e3e3a407f..13438b9cb 100644 --- a/openbsc/src/bsc_hack.c +++ b/openbsc/src/bsc_hack.c @@ -49,8 +49,6 @@ #include <openbsc/signal.h> #include <openbsc/talloc.h> -void *tall_bsc_ctx; - /* global pointer to the gsm network data structure */ static struct gsm_network *gsmnet; diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c index 81facdf04..c21c6b4f5 100644 --- a/openbsc/src/gsm_data.c +++ b/openbsc/src/gsm_data.c @@ -27,6 +27,8 @@ #include <openbsc/gsm_data.h> #include <openbsc/talloc.h> +void *tall_bsc_ctx; + void set_ts_e1link(struct gsm_bts_trx_ts *ts, u_int8_t e1_nr, u_int8_t e1_ts, u_int8_t e1_ts_ss) { |