aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-02-14 00:19:11 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-02-14 12:55:45 +0100
commit92b9f2ecd42c1751d2123879951bab8837415d1a (patch)
tree6c96beebe974f204cd7da01fb70f4e7cf75cf27c
parent6dd5a9b017e05f204ea63fadf2ccda9af3131d96 (diff)
common_cs.h: mv gsm_encr to gsm_data.h
This leaves common_cs.h practically empty. Leave its removal to the next patch, which removes libcommon-cs entirely (I07d4a48af3154ee4d904686f230a51b8b8a94ff9). Change-Id: Ic3233f03580aa8c0ab178dfd33e68ecab5b9f042
-rw-r--r--include/osmocom/bsc/common_cs.h8
-rw-r--r--include/osmocom/bsc/gsm_data.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h
index f751a436c..b6a8ed831 100644
--- a/include/osmocom/bsc/common_cs.h
+++ b/include/osmocom/bsc/common_cs.h
@@ -7,11 +7,3 @@ struct msgb;
struct gsm_network;
struct vty;
-
-#define MAX_A5_KEY_LEN (128/8)
-
-struct gsm_encr {
- uint8_t alg_id;
- uint8_t key_len;
- uint8_t key[MAX_A5_KEY_LEN];
-};
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 1d12f3df4..8af594fc8 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -300,6 +300,14 @@ enum lchan_sapi_state {
LCHAN_SAPI_S_ERROR,
};
+#define MAX_A5_KEY_LEN (128/8)
+
+struct gsm_encr {
+ uint8_t alg_id;
+ uint8_t key_len;
+ uint8_t key[MAX_A5_KEY_LEN];
+};
+
struct gsm_lchan {
/* The TS that we're part of */
struct gsm_bts_trx_ts *ts;