diff options
author | Pau Espin Pedrol <pespin@espeweb.net> | 2021-02-11 19:00:19 +0100 |
---|---|---|
committer | laforge <laforge@osmocom.org> | 2021-02-13 08:15:01 +0000 |
commit | a27e8a5c9a797638a00bdf8ecdf1276ae5c4c6cc (patch) | |
tree | 8413afe552990099307c9b0176958f5cb0d81589 | |
parent | ff5dcf7fd3b955cbf5670f55082d4650f2b5578f (diff) |
Move bts_ident_key to neighbor_ident.c
The function is not really handover specific, and will be used in other
places in subsequent patches.
Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746
-rw-r--r-- | include/osmocom/bsc/handover.h | 2 | ||||
-rw-r--r-- | include/osmocom/bsc/neighbor_ident.h | 2 | ||||
-rw-r--r-- | src/osmo-bsc/handover_logic.c | 11 | ||||
-rw-r--r-- | src/osmo-bsc/neighbor_ident.c | 11 |
4 files changed, 13 insertions, 13 deletions
diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index d22ac8696..a71bb98f0 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -86,8 +86,6 @@ int find_handover_target_cell(struct gsm_bts **local_target_cell_p, struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, bool log_errors); -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); - void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn, struct msgb *ho_request_msg); diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h index c8580e22b..cab7f9e29 100644 --- a/include/osmocom/bsc/neighbor_ident.h +++ b/include/osmocom/bsc/neighbor_ident.h @@ -45,6 +45,8 @@ void neighbor_ident_iter(const struct neighbor_ident_list *nil, void *cb_data), void *cb_data); +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); + void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil); void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts); void neighbor_ident_vty_write_network(struct vty *vty, const char *indent); diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index ade330d46..b0d175af5 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -322,17 +322,6 @@ int find_handover_target_cell(struct gsm_bts **local_target_cell_p, return -ENODEV; } -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) -{ - static struct neighbor_ident_key key; - key = (struct neighbor_ident_key){ - .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, - .arfcn = bts->c0->arfcn, - .bsic = bts->bsic, - }; - return &key; -} - static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index 185cd0b07..335091e3a 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -261,6 +261,17 @@ void neighbor_ident_iter(const struct neighbor_ident_list *nil, } } +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) +{ + static struct neighbor_ident_key key; + key = (struct neighbor_ident_key){ + .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, + .arfcn = bts->c0->arfcn, + .bsic = bts->bsic, + }; + return &key; +} + /* Neighbor Resolution CTRL iface */ CTRL_CMD_DEFINE_RO(neighbor_resolve_cgi_ps_from_lac_ci, "neighbor_resolve_cgi_ps_from_lac_ci"); |