Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 )

Change subject: Move bts_ident_key to neighbor_ident.c
......................................................................

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
---
M include/osmocom/bsc/handover.h
M include/osmocom/bsc/neighbor_ident.h
M src/osmo-bsc/handover_logic.c
M src/osmo-bsc/neighbor_ident.c
4 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h
index d22ac86..a71bb98 100644
--- a/include/osmocom/bsc/handover.h
+++ b/include/osmocom/bsc/handover.h
@@ -86,8 +86,6 @@
 			      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 c8580e2..cab7f9e 100644
--- a/include/osmocom/bsc/neighbor_ident.h
+++ b/include/osmocom/bsc/neighbor_ident.h
@@ -45,6 +45,8 @@
 					   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 ade330d..b0d175a 100644
--- a/src/osmo-bsc/handover_logic.c
+++ b/src/osmo-bsc/handover_logic.c
@@ -322,17 +322,6 @@
 	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 185cd0b..335091e 100644
--- a/src/osmo-bsc/neighbor_ident.c
+++ b/src/osmo-bsc/neighbor_ident.c
@@ -261,6 +261,17 @@
 	}
 }
 
+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");

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746
Gerrit-Change-Number: 22813
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210213/c7b8e857/attachment.htm>