3 files changed, 5 insertions, 14 deletions
diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h
index fe19ff441..a8b2de958 100644
--- a/openbsc/include/openbsc/gsm_04_08.h
+++ b/openbsc/include/openbsc/gsm_04_08.h
@@ -26,20 +26,6 @@ static inline struct msgb *gsm48_msgb_alloc_name(const char *name)
 				   name);
 }
 
-static inline int get_radio_link_timeout(struct gsm48_cell_options *cell_options)
-{
-	return (cell_options->radio_link_timeout + 1) << 2;
-}
-
-static inline void set_radio_link_timeout(struct gsm48_cell_options *cell_options, int value)
-{
-	if (value < 4)
-		value = 4;
-	if (value > 64)
-		value = 64;
-	cell_options->radio_link_timeout = (value >> 2) - 1;
-}
-
 /* config options controlling the behaviour of the lower leves */
 void gsm0408_allow_everyone(int allow);
 void gsm0408_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause);
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 5ab7c3fbd..a97405105 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -590,4 +590,7 @@ void bts_depend_clear(struct gsm_bts *bts, int dep);
 int bts_depend_check(struct gsm_bts *bts);
 int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other);
 
+int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts);
+void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value);
+
 #endif /* _GSM_DATA_H */
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index d3fd75700..4c71a075e 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -872,6 +872,8 @@ struct gsm_bts {
 		} data;
 	} si_common;
 	bool early_classmark_allowed;
+	/* for testing only: Have an infinitely long radio link timeout */
+	bool infinite_radio_link_timeout;
 
 	/* do we use static (user-defined) system information messages? (bitmask) */
 	uint32_t si_mode_static;