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/osmo_bsc_grace.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/osmo_bsc_grace.c')
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_grace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c index 9ee84d4cf..56edee569 100644 --- a/src/osmo-bsc/osmo_bsc_grace.c +++ b/src/osmo-bsc/osmo_bsc_grace.c @@ -30,7 +30,7 @@ int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts * { if (bts->excl_from_rf_lock) return 1; - return network->bsc_data->rf_ctrl->policy == S_RF_ON; + return network->rf_ctrl->policy == S_RF_ON; } |