From 6e688082476310be0192a17440a3432bcbb7128e Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 24 Aug 2014 17:38:18 +0200
Subject: [PATCH] move GSM_RESERVED_TMSI to libosmocore

The gb_proxy shouldn't start to open the box of pandora by including the
gsm_data_shared.h file, particularly not without defining the BSC role.

In any case, as the reserved TMSI is something that's part of the GSM
specs, and not specific to the OpenBSC implementation, it should be part
of libosmocore.
---
 openbsc/include/openbsc/gsm_data_shared.h | 3 ---
 openbsc/src/gprs/gb_proxy_patch.c         | 1 -
 openbsc/src/gprs/gb_proxy_tlli.c          | 3 ++-
 openbsc/src/gprs/gprs_gb_parse.c          | 3 ++-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 2a3b0e269..2fdc7638d 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -57,9 +57,6 @@ enum gsm_chreq_reason_t {
 #define HARDCODED_BTS1_TS	6
 #define HARDCODED_BTS2_TS	11
 
-/* reserved according to GSM 03.03 § 2.4 */
-#define GSM_RESERVED_TMSI   0xFFFFFFFF
-
 enum gsm_hooks {
 	GSM_HOOK_NM_SWLOAD,
 	GSM_HOOK_RR_PAGING,
diff --git a/openbsc/src/gprs/gb_proxy_patch.c b/openbsc/src/gprs/gb_proxy_patch.c
index 59d0b2f2b..35355ba0d 100644
--- a/openbsc/src/gprs/gb_proxy_patch.c
+++ b/openbsc/src/gprs/gb_proxy_patch.c
@@ -23,7 +23,6 @@
 #include <openbsc/gprs_utils.h>
 #include <openbsc/gprs_gb_parse.h>
 
-#include <openbsc/gsm_data_shared.h>
 #include <openbsc/gsm_04_08_gprs.h>
 #include <openbsc/debug.h>
 
diff --git a/openbsc/src/gprs/gb_proxy_tlli.c b/openbsc/src/gprs/gb_proxy_tlli.c
index ccd118ed5..f554db1f4 100644
--- a/openbsc/src/gprs/gb_proxy_tlli.c
+++ b/openbsc/src/gprs/gb_proxy_tlli.c
@@ -18,12 +18,13 @@
  *
  */
 
+#include <osmocom/gsm/gsm48.h>
+
 #include <openbsc/gb_proxy.h>
 
 #include <openbsc/gprs_utils.h>
 #include <openbsc/gprs_gb_parse.h>
 
-#include <openbsc/gsm_data_shared.h>
 #include <openbsc/debug.h>
 
 #include <osmocom/gsm/gsm_utils.h>
diff --git a/openbsc/src/gprs/gprs_gb_parse.c b/openbsc/src/gprs/gprs_gb_parse.c
index 72c0d57e8..f2ab20075 100644
--- a/openbsc/src/gprs/gprs_gb_parse.c
+++ b/openbsc/src/gprs/gprs_gb_parse.c
@@ -18,12 +18,13 @@
  *
  */
 
+#include <osmocom/gsm/gsm48.h>
+
 #include <openbsc/gprs_gb_parse.h>
 
 #include <openbsc/gprs_utils.h>
 
 #include <openbsc/gsm_04_08_gprs.h>
-#include <openbsc/gsm_data_shared.h>
 #include <openbsc/debug.h>
 
 #include <osmocom/gprs/gprs_bssgp.h>