diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-05-26 12:41:18 +0200 |
|---|---|---|
| committer | neels <nhofmeyr@sysmocom.de> | 2020-05-29 20:16:40 +0000 |
| commit | 06a14d289bf20f218d22380b11c4ad81ca5f54d2 (patch) | |
| tree | db4a8071784e43a9689033786230453afd5624c5 /src/osmo-bsc/cbsp_link.c | |
| parent | b281b1cdb670dbd26354c1f45ce85a477bf5ed15 (diff) | |
flatten: move network->bsc_data->* to network->*
The separate struct osmo_bsc_data is like another separate struct gsm_network
for no reason. It is labeled "per-BSC data". These days, all of this is a
single BSC and there will not be different sets of osmo_bsc_data.
Drop struct osmo_bsc_data, move its members directly into gsm_network.
Some places tested 'if (net->bsc_data)', which is always true. Modify those
cases to rather do checks like 'if (net->rf_ctrl)', which are also always true
AFAICT, to keep as much unmodified logic as possible in this patch.
Change-Id: Ic7ae65e3b36e6e4b279eb01ad594f1226b5929e0
Diffstat (limited to 'src/osmo-bsc/cbsp_link.c')
| -rw-r--r-- | src/osmo-bsc/cbsp_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 8840afa52..91217ad41 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -192,7 +192,7 @@ static int cbsp_client_read_cb(struct osmo_stream_cli *cli) int bsc_cbc_link_restart(void) { - struct bsc_cbc_link *cbc = bsc_gsmnet->bsc_data->cbc; + struct bsc_cbc_link *cbc = bsc_gsmnet->cbc; /* shut down client, if no longer configured */ if (cbc->client.cli && !cbc->config.cbc_hostname) { @@ -280,7 +280,7 @@ int cbsp_tx_decoded(struct bsc_cbc_link *cbc, struct osmo_cbsp_decoded *cbsp) static struct bsc_cbc_link *vty_cbc_data(struct vty *vty) { - return bsc_gsmnet->bsc_data->cbc; + return bsc_gsmnet->cbc; } /********************************************************************************* |