diff options
Diffstat (limited to 'openbsc/src/osmo-bsc')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_filter.c | 5 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_grace.c | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index dda31578e..a801e0e69 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -167,7 +167,7 @@ static int bssmap_handle_paging(struct osmo_msc_data *msc, LOGP(DMSC, LOGL_ERROR, "eMLPP is not handled\n"); } - subscr = subscr_get_or_create(msc->network, mi_string); + subscr = subscr_get_or_create(msc->network->subscr_group, mi_string); if (!subscr) { LOGP(DMSC, LOGL_ERROR, "Failed to allocate a subscriber for %s\n", mi_string); return -1; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_filter.c b/openbsc/src/osmo-bsc/osmo_bsc_filter.c index 608f52552..596bfbdc1 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_filter.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_filter.c @@ -78,11 +78,12 @@ static struct gsm_subscriber *extract_sub(struct gsm_subscriber_connection *conn switch (mi_type) { case GSM_MI_TYPE_TMSI: - subscr = subscr_active_by_tmsi(conn->bts->network, + subscr = subscr_active_by_tmsi(conn->bts->network->subscr_group, tmsi_from_string(mi_string)); break; case GSM_MI_TYPE_IMSI: - subscr = subscr_active_by_imsi(conn->bts->network, mi_string); + subscr = subscr_active_by_imsi(conn->bts->network->subscr_group, + mi_string); break; default: subscr = NULL; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_grace.c b/openbsc/src/osmo-bsc/osmo_bsc_grace.c index 4e1c79ebd..aa268a40a 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_grace.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_grace.c @@ -41,7 +41,7 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, { struct gsm_bts *bts = NULL; - if (subscr->net->bsc_data->rf_ctrl->policy == S_RF_ON) + if (subscr->group->net->bsc_data->rf_ctrl->policy == S_RF_ON) goto page; /* @@ -49,7 +49,7 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, * with NULL and iterate through all bts. */ do { - bts = gsm_bts_by_lac(subscr->net, subscr->lac, bts); + bts = gsm_bts_by_lac(subscr->group->net, subscr->lac, bts); if (!bts) break; @@ -68,7 +68,8 @@ int bsc_grace_paging_request(struct gsm_subscriber *subscr, int chan_needed, /* All bts are either off or in the grace period */ return 0; page: - return paging_request(subscr->net, subscr, chan_needed, NULL, msc); + return paging_request(subscr->group->net, subscr, chan_needed, NULL, + msc); } static int handle_sub(struct gsm_lchan *lchan, const char *text) |