diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-04-24 11:36:15 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-04-29 20:44:42 +0200 |
commit | e48c1871aff174faf2341a57b84104ab0d2abb67 (patch) | |
tree | ebddbdcfd212e24a2b40f4586505dd5625bbef88 /openbsc/src/ipaccess | |
parent | 4b0e36ae7f73fdabbb422bd0458843e1af3cb0c9 (diff) |
ipaccess: Remove the ipaccess_gsmnet and assume there is a bsc_gsmnet
Assume that there is a bsc_gsmnet and modify the ipaccess-config to
provide this symbol. If a bsc_gsmmnet is not available when linked
the linker will complain and fail.
E.g. give an error like this:
../../src/libbsc/libbsc.a(bts_ipaccess_nanobts.o): In function `ipaccess_sign_link_up':
src/libbsc/bts_ipaccess_nanobts.c:550: undefined reference to `bsc_gsmnet'
Diffstat (limited to 'openbsc/src/ipaccess')
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index 05fdc14af..14749d830 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -53,7 +53,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> -static struct gsm_network *gsmnet; +struct gsm_network *bsc_gsmnet; static int net_listen_testnr; static int restart; @@ -980,11 +980,11 @@ int main(int argc, char **argv) } libosmo_abis_init(tall_ctx_config); - gsmnet = gsm_network_init(1, 1, NULL); - if (!gsmnet) + bsc_gsmnet = gsm_network_init(1, 1, NULL); + if (!bsc_gsmnet) exit(1); - bts = gsm_bts_alloc_register(gsmnet, GSM_BTS_TYPE_NANOBTS, HARDCODED_TSC, + bts = gsm_bts_alloc_register(bsc_gsmnet, GSM_BTS_TYPE_NANOBTS, HARDCODED_TSC, HARDCODED_BSIC); /* ip.access supports up to 4 chained TRX */ gsm_bts_trx_alloc(bts); |