aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2020-09-23 01:32:11 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2020-09-25 01:45:08 +0200
commitcbcfe9918b975df559db96ff34b39e0b13fbbf66 (patch)
tree0244ecf143580488775bfa929c804cdff4abe643
parent192fefe53d13887568fe793e229c465a4e5e8177 (diff)
drop duplicate ran_peer_find() vs ran_peer_find_by_addr()
This is the same function existing twice with different names. Keep only one. Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf
-rw-r--r--include/osmocom/msc/ran_peer.h3
-rw-r--r--src/libmsc/ran_peer.c15
2 files changed, 3 insertions, 15 deletions
diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h
index 06ab50090..bdca3177a 100644
--- a/include/osmocom/msc/ran_peer.h
+++ b/include/osmocom/msc/ran_peer.h
@@ -91,7 +91,7 @@ struct ran_peer_ev_ctx {
};
struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);
void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id);
@@ -106,4 +106,3 @@ int ran_peer_down_paging(struct ran_peer *rp, const struct gsm0808_cell_id *page
struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struct gsm0808_cell_id *cid,
bool expecting_single_match);
-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr);
diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c
index 001dfb1e0..fcb5f5ad2 100644
--- a/src/libmsc/ran_peer.c
+++ b/src/libmsc/ran_peer.c
@@ -80,13 +80,13 @@ static struct ran_peer *ran_peer_alloc(struct sccp_ran_inst *sri, const struct o
struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
{
- struct ran_peer *rp = ran_peer_find(sri, peer_addr);
+ struct ran_peer *rp = ran_peer_find_by_addr(sri, peer_addr);
if (rp)
return rp;
return ran_peer_alloc(sri, peer_addr);
}
-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)
{
struct ran_peer *rp;
llist_for_each_entry(rp, &sri->ran_peers, entry) {
@@ -624,17 +624,6 @@ struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struc
return found;
}
-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr)
-{
- struct ran_peer *rp;
-
- llist_for_each_entry(rp, &sri->ran_peers, entry) {
- if (!osmo_sccp_addr_ri_cmp(addr, &rp->peer_addr))
- return rp;
- }
- return NULL;
-}
-
int ran_peers_down_paging(struct sccp_ran_inst *sri, enum CELL_IDENT page_where, struct vlr_subscr *vsub,
enum paging_cause cause)
{