Neels Hofmeyr has submitted this change and it was merged. Change subject: common_cs.h: mv gsm_encr to gsm_data.h ......................................................................
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 --- M include/osmocom/bsc/common_cs.h M include/osmocom/bsc/gsm_data.h 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h index f751a43..b6a8ed8 100644 --- a/include/osmocom/bsc/common_cs.h +++ b/include/osmocom/bsc/common_cs.h @@ -7,11 +7,3 @@ 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 1d12f3d..8af594f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -300,6 +300,14 @@ 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; -- To view, visit https://gerrit.osmocom.org/6442 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3233f03580aa8c0ab178dfd33e68ecab5b9f042 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de>