diff options
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-config.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_init.c | 3 | ||||
-rw-r--r-- | openbsc/src/libbsc/net_init.c | 3 | ||||
-rw-r--r-- | openbsc/src/utils/bs11_config.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index 3c2d6cc94..06589f7eb 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -986,7 +986,7 @@ int main(int argc, char **argv) } libosmo_abis_init(tall_ctx_config); - bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, NULL); + bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, NULL); if (!bsc_gsmnet) exit(1); diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index a1becf849..214926b16 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -36,6 +36,7 @@ #include <openbsc/ipaccess.h> #include <osmocom/gsm/sysinfo.h> #include <openbsc/e1_config.h> +#include <openbsc/osmo_bsc.h> /* global pointer to the gsm network data structure */ extern struct gsm_network *bsc_gsmnet; @@ -481,7 +482,7 @@ int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *config_file) int rc; /* initialize our data structures */ - bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, mncc_recv); + bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, mncc_recv); if (!bsc_gsmnet) return -ENOMEM; diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index da13a52f6..07a442356 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -17,13 +17,14 @@ * */ +#include <openbsc/osmo_bsc.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_msc_data.h> #include <openbsc/gsm_subscriber.h> #include <stdbool.h> -struct gsm_network *gsm_network_init(void *ctx, +struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, uint16_t network_code, mncc_recv_cb_t mncc_recv) diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index 20b9ed335..ee43a4084 100644 --- a/openbsc/src/utils/bs11_config.c +++ b/openbsc/src/utils/bs11_config.c @@ -897,7 +897,7 @@ int main(int argc, char **argv) handle_options(argc, argv); bts_model_bs11_init(); - gsmnet = gsm_network_init(tall_bs11cfg_ctx, 1, 1, NULL); + gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1, NULL); if (!gsmnet) { fprintf(stderr, "Unable to allocate gsm network\n"); exit(1); |