bsc: Move more things to use osmo_msc_data* directly
diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h
index 6f9f3a2..384549e 100644
--- a/openbsc/include/openbsc/osmo_msc_data.h
+++ b/openbsc/include/openbsc/osmo_msc_data.h
@@ -81,7 +81,7 @@
};
-int osmo_bsc_msc_init(struct gsm_network *network);
+int osmo_bsc_msc_init(struct osmo_msc_data *msc);
int osmo_bsc_sccp_init(struct gsm_network *gsmnet);
int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index 02b68d3..6e34105 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -443,7 +443,7 @@
}
}
- if (osmo_bsc_msc_init(bsc_gsmnet) != 0) {
+ if (osmo_bsc_msc_init(&bsc_gsmnet->bsc_data->msc) != 0) {
LOGP(DNAT, LOGL_ERROR, "Failed to start up. Exiting.\n");
exit(1);
}
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
index 64f2800..1ed0199 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
@@ -430,10 +430,8 @@
msc_queue_write(data->msc_con, msg, IPAC_PROTO_IPACCESS);
}
-int osmo_bsc_msc_init(struct gsm_network *network)
+int osmo_bsc_msc_init(struct osmo_msc_data *data)
{
- struct osmo_msc_data *data = &network->bsc_data->msc;
-
if (mgcp_create_port(data) != 0)
return -1;