From d8cd756da48bcff9f9caf9e64fc0af047a165b60 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 17 Mar 2018 12:22:40 +0100 Subject: Get rid of 'struct gsm_bts_role_bts' gsm_bts_role_bts was introduced at a time when we still shared gsm_data_shared.[ch] between BSC and BTS, and where we then subsequently needed a BTS-private structure. Since that sharing was abandoned quite some time ago, we can merge gsm_bts_role_bts into gsm_bts and do away with the bts/btsb dualism in a lot of the code. Change-Id: I4fdd601ea873d9697f89a748cc77bcf7c978fa3e --- src/osmo-bts-sysmo/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/osmo-bts-sysmo/main.c') diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index efcf4a8d..b63d07ef 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -57,14 +57,12 @@ int bts_model_init(struct gsm_bts *bts) { - struct gsm_bts_role_bts *btsb; struct stat st; static struct osmo_fd accept_fd, read_fd; int rc; bts->variant = BTS_OSMO_SYSMO; - btsb = bts_role_bts(bts); - btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); if (rc < 0) { -- cgit v1.2.3