<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22813">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move bts_ident_key to neighbor_ident.c<br><br>The function is not really handover specific, and will be used in other<br>places in subsequent patches.<br><br>Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746<br>---<br>M include/osmocom/bsc/handover.h<br>M include/osmocom/bsc/neighbor_ident.h<br>M src/osmo-bsc/handover_logic.c<br>M src/osmo-bsc/neighbor_ident.c<br>4 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h</span><br><span>index d22ac86..a71bb98 100644</span><br><span>--- a/include/osmocom/bsc/handover.h</span><br><span>+++ b/include/osmocom/bsc/handover.h</span><br><span>@@ -86,8 +86,6 @@</span><br><span>                            struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for,</span><br><span>                         bool log_errors);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn,</span><br><span>                           struct msgb *ho_request_msg);</span><br><span> </span><br><span>diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h</span><br><span>index c8580e2..cab7f9e 100644</span><br><span>--- a/include/osmocom/bsc/neighbor_ident.h</span><br><span>+++ b/include/osmocom/bsc/neighbor_ident.h</span><br><span>@@ -45,6 +45,8 @@</span><br><span>                                     void *cb_data),</span><br><span>                    void *cb_data);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil);</span><br><span> void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts);</span><br><span> void neighbor_ident_vty_write_network(struct vty *vty, const char *indent);</span><br><span>diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c</span><br><span>index ade330d..b0d175a 100644</span><br><span>--- a/src/osmo-bsc/handover_logic.c</span><br><span>+++ b/src/osmo-bsc/handover_logic.c</span><br><span>@@ -322,17 +322,6 @@</span><br><span>       return -ENODEV;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-    static struct neighbor_ident_key key;</span><br><span style="color: hsl(0, 100%, 40%);">-   key = (struct neighbor_ident_key){</span><br><span style="color: hsl(0, 100%, 40%);">-              .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS,</span><br><span style="color: hsl(0, 100%, 40%);">-         .arfcn = bts->c0->arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">-          .bsic = bts->bsic,</span><br><span style="color: hsl(0, 100%, 40%);">-   };</span><br><span style="color: hsl(0, 100%, 40%);">-      return &key;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span>                       void *handler_data, void *signal_data)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c</span><br><span>index 185cd0b..335091e 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident.c</span><br><span>@@ -261,6 +261,17 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    static struct neighbor_ident_key key;</span><br><span style="color: hsl(120, 100%, 40%);">+ key = (struct neighbor_ident_key){</span><br><span style="color: hsl(120, 100%, 40%);">+            .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS,</span><br><span style="color: hsl(120, 100%, 40%);">+               .arfcn = bts->c0->arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+                .bsic = bts->bsic,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+    return &key;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Neighbor Resolution CTRL iface */</span><br><span> </span><br><span> CTRL_CMD_DEFINE_RO(neighbor_resolve_cgi_ps_from_lac_ci, "neighbor_resolve_cgi_ps_from_lac_ci");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22813">change 22813</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/22813"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 </div>
<div style="display:none"> Gerrit-Change-Number: 22813 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>