Rearrange declaration of struct gsm_bts_gprs_nsvc

Move it together with the other similar objects like gprs_nse and
gprs_cell.
Move the "mo" field to the start of the struct, similar to the other
types.

Change-Id: I5dc020a6bab8c94ab831b6ca506bc5cb681d07a3

1 files changed, 12 insertions, 12 deletions

diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index c5a0709a..03a29e4e 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -72,18 +72,6 @@ const char *btsvariant2str(enum gsm_bts_type_variant v);
 #define bts_internal_flag_set(bts, flag) \
 	bts->flags |= (typeof(bts->flags)) flag
 
-struct gsm_bts_gprs_nsvc {
-	struct gsm_bts *bts;
-	/* data read via VTY config file, to configure the BTS
-	 * via OML from BSC */
-	int id;
-	uint16_t nsvci;
-	struct osmo_sockaddr local;	/* on the BTS */
-	struct osmo_sockaddr remote;	/* on the SGSN */
-
-	struct gsm_abis_mo mo;
-};
-
 struct gprs_rlc_cfg {
 	uint16_t parameter[_NUM_RLC_PAR];
 	struct {
@@ -136,6 +124,18 @@ struct gsm_bts_sm {
 	struct gsm_abis_mo mo;
 };
 
+/* GPRS NSVC; ip.access specific NM Object */
+struct gsm_bts_gprs_nsvc {
+	struct gsm_abis_mo mo;
+	struct gsm_bts *bts;
+	/* data read via VTY config file, to configure the BTS
+	 * via OML from BSC */
+	int id;
+	uint16_t nsvci;
+	struct osmo_sockaddr local;	/* on the BTS */
+	struct osmo_sockaddr remote;	/* on the SGSN */
+};
+
 /* GPRS NSE; ip.access specific NM Object */
 struct gsm_gprs_nse {
 	struct gsm_abis_mo mo;