cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

bsc: rf_ctrl will always be created, remove the NULL checks

This commit is contained in:
Holger Hans Peter Freyther 2014-02-08 12:12:03 +01:00
parent 362d10f20a
commit a9fae1ae66
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/src/libbsc/bsc_rf_ctrl.c
View File

@ -108,7 +108,7 @@ enum osmo_bsc_rf_policy osmo_bsc_rf_get_policy_by_bts(struct gsm_bts *bts)
{
struct osmo_bsc_data *bsc_data = bts->network->bsc_data;
if (!bsc_data || !bsc_data->rf_ctrl)
if (!bsc_data)
return OSMO_BSC_RF_POLICY_UNKNOWN;
switch (bsc_data->rf_ctrl->policy) {
@ -412,7 +412,7 @@ static int msc_signal_handler(unsigned int subsys, unsigned int signal,
msc = signal_data;
/* check if we have the needed information */
if (!net->bsc_data || !net->bsc_data->rf_ctrl)
if (!net->bsc_data)
return 0;
if (msc->data->type != MSC_CON_TYPE_NORMAL)
return 0;

4
openbsc/src/libbsc/bsc_vty.c
View File

@ -210,11 +210,11 @@ static void net_dump_vty(struct vty *vty, struct gsm_network *net)
dump_pchan_load_vty(vty, " ", &pl);
/* show rf */
if (net->bsc_data && net->bsc_data->rf_ctrl)
if (net->bsc_data)
vty_out(vty, " Last RF Command: %s%s",
net->bsc_data->rf_ctrl->last_state_command,
VTY_NEWLINE);
if (net->bsc_data && net->bsc_data->rf_ctrl)
if (net->bsc_data)
vty_out(vty, " Last RF Lock Command: %s%s",
net->bsc_data->rf_ctrl->last_rf_lock_ctrl_command,
VTY_NEWLINE);

4
openbsc/src/osmo-bsc/osmo_bsc_grace.c
View File

@ -28,8 +28,6 @@
int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts)
{
if (!network->bsc_data->rf_ctrl)
return 1;
if (bts->excl_from_rf_lock)
return 1;
return network->bsc_data->rf_ctrl->policy == S_RF_ON;
@ -43,8 +41,6 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed,
{
struct gsm_bts *bts = NULL;
if (!subscr->net->bsc_data->rf_ctrl)
goto page;
if (subscr->net->bsc_data->rf_ctrl->policy == S_RF_ON)
goto page;