diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-15 15:53:00 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-25 23:16:21 +0200 |
| commit | 6c21ff3d2e75abeaa11d1b0c0908a3ad58534c27 (patch) | |
| tree | 7959e3ce8bae13d860d03ffd4a96bb52b4af7d71 /openbsc/src/osmo-bsc/osmo_bsc_api.c | |
| parent | d7ff30eb6240a8de3e6b07c73a9146f63fa8d961 (diff) | |
bsc: Create a osmo_bsc_data and embed osmo_msc_data
We want to have multiple MSCs but we also have some data
that is only present on a per BSC basis. Right now the
MSC data is not allocated with talloc, so we have some
change in the talloc contexts.
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_api.c')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_api.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/openbsc/src/osmo-bsc/osmo_bsc_api.c index d02b0b5e4..9cb0f9ee3 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_api.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_api.c @@ -1,5 +1,5 @@ -/* (C) 2009-2010 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2009-2010 by On-Waves +/* (C) 2009-2011 by Holger Hans Peter Freyther <zecke@selfish.org> + * (C) 2009-2011 by On-Waves * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -47,15 +47,15 @@ static uint16_t get_network_code_for_msc(struct gsm_network *net) { - if (net->msc_data->core_ncc != -1) - return net->msc_data->core_ncc; + if (net->bsc_data->msc.core_ncc != -1) + return net->bsc_data->msc.core_ncc; return net->network_code; } static uint16_t get_country_code_for_msc(struct gsm_network *net) { - if (net->msc_data->core_mcc != -1) - return net->msc_data->core_mcc; + if (net->bsc_data->msc.core_mcc != -1) + return net->bsc_data->msc.core_mcc; return net->country_code; } |