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/bsc_ctrl_commands.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/bsc_ctrl_commands.c')
| -rw-r--r-- | src/osmo-bsc/bsc_ctrl_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index ca182d7d1..774ded21b 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -349,7 +349,7 @@ static int get_net_rf_lock(struct ctrl_cmd *cmd, void *data) struct gsm_bts *bts; const char *policy_name; - policy_name = osmo_bsc_rf_get_policy_name(net->bsc_data->rf_ctrl->policy); + policy_name = osmo_bsc_rf_get_policy_name(net->rf_ctrl->policy); llist_for_each_entry(bts, &net->bts_list, list) { struct gsm_bts_trx *trx; @@ -389,7 +389,7 @@ static int set_net_rf_lock(struct ctrl_cmd *cmd, void *data) return CTRL_CMD_ERROR; } - rf = net->bsc_data->rf_ctrl; + rf = net->rf_ctrl; if (!rf) { cmd->reply = "RF Ctrl is not enabled in the BSC Configuration"; |