2 files changed, 10 insertions, 22 deletions
diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index 364fa727b..43adaec00 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -181,26 +181,6 @@ struct bsc_msc_data {
 	} mgcp_ipa;
 };
 
-/*
- * Per BSC data.
- */
-struct bsc_cbc_link;
-struct osmo_bsc_data {
-	struct gsm_network *network;
-
-	/* msc configuration */
-	struct llist_head mscs;
-
-	/* rf ctl related bits */
-	int mid_call_timeout;
-	char *rf_ctrl_name;
-	struct osmo_bsc_rf *rf_ctrl;
-	int auto_off_timeout;
-
-	struct bsc_cbc_link *cbc;
-};
-
-
 int osmo_bsc_msc_init(struct bsc_msc_data *msc);
 int osmo_bsc_sccp_init(struct gsm_network *gsmnet);
 
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index d801d2c77..42eb583e7 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1649,8 +1649,16 @@ struct gsm_network {
 	/* Use a TCH for handling requests of type paging any */
 	int pag_any_tch;
 
-	/* MSC data in case we are a true BSC */
-	struct osmo_bsc_data *bsc_data;
+	/* msc configuration */
+	struct llist_head mscs;
+
+	/* rf ctl related bits */
+	int mid_call_timeout;
+	char *rf_ctrl_name;
+	struct osmo_bsc_rf *rf_ctrl;
+	int auto_off_timeout;
+
+	struct bsc_cbc_link *cbc;
 
 	/* control interface */
 	struct ctrl_handle *ctrl;