3 files changed, 9 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 254feaf86..523641a86 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -205,10 +205,6 @@ enum gsm_auth_policy {
 
 struct gsm_network {
 	/* global parameters */
-	uint16_t country_code;
-	uint16_t network_code;
-	char *name_long;
-	char *name_short;
 	enum gsm_auth_policy auth_policy;
 	enum gsm48_reject_value reject_cause;
 	int a5_encryption;
@@ -328,8 +324,7 @@ struct gsm_sms {
 	char text[SMS_TEXT_SIZE];
 };
 
-struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_code,
-				     int (*mncc_recv)(struct gsm_network *, struct msgb *));
+struct gsm_network *gsm_network_init(int (*mncc_recv)(struct gsm_network *, struct msgb *));
 int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type);
 
 /* Get reference to a neighbor cell on a given BCCH ARFCN */
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 0704bd753..217474f17 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -731,6 +731,12 @@ struct gsm_bts {
 	struct bts_codec_conf codec;
 #endif /* ROLE_BSC */
 	void *role;
+
+	/* hacks for some network tweaks... */
+	uint16_t country_code;
+	uint16_t network_code;
+	char *name_long;
+	char *name_short;
 };
 
 
diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h
index 7aae4c332..8622aff07 100644
--- a/openbsc/include/openbsc/gsm_subscriber.h
+++ b/openbsc/include/openbsc/gsm_subscriber.h
@@ -36,6 +36,8 @@ struct gsm_subscriber {
 	long long unsigned int id;
 	char imsi[GSM_IMSI_LENGTH];
 	uint32_t tmsi;
+	uint16_t mnc;
+	uint16_t mcc;
 	uint16_t lac;
 	char name[GSM_NAME_LENGTH];
 	char extension[GSM_EXTENSION_LENGTH];