From: Jon Maloy <jma...@redhat.com>
We simplify the signatures of the functions tipc_service_create_range()
and tipc_service_finc_range().
Signed-off-by: Jon Maloy <jma...@redhat.com>
---
net/tipc/name_table.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 7f2fb446233e..57abed74d0d9 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -276,13 +276,13 @@ static struct tipc_service *tipc_service_create(u32 type,
struct hlist_head *hd)
/* tipc_service_find_range - find service range matching publication
parameters
*/
static struct service_range *tipc_service_find_range(struct tipc_service *sc,
- u32 lower, u32 upper)
+ struct tipc_uaddr *ua)
{
struct service_range *sr;
- service_range_foreach_match(sr, sc, lower, upper) {
+ service_range_foreach_match(sr, sc, ua->sr.lower, ua->sr.upper) {
/* Look for exact match */
- if (sr->lower == lower && sr->upper == upper)
+ if (sr->lower == ua->sr.lower && sr->upper == ua->sr.upper)
return sr;
}
@@ -290,10 +290,12 @@ static struct service_range
*tipc_service_find_range(struct tipc_service *sc,
}
static struct service_range *tipc_service_create_range(struct tipc_service *sc,
- u32 lower, u32 upper)
+ struct publication *p)
{
struct rb_node **n, *parent = NULL;
struct service_range *sr;
+ u32 lower = p->sr.lower;
+ u32 upper = p->sr.upper;
n = &sc->ranges.rb_node;
while (*n) {
@@ -331,7 +333,7 @@ static bool tipc_service_insert_publ(struct net *net,
u32 node = p->sk.node;
bool first = false;
- sr = tipc_service_create_range(sc, p->sr.lower, p->sr.upper);
+ sr = tipc_service_create_range(sc, p);
if (!sr)
goto err;
@@ -515,7 +517,7 @@ struct publication *tipc_nametbl_remove_publ(struct net
*net,
return NULL;
spin_lock_bh(&sc->lock);
- sr = tipc_service_find_range(sc, ua->sr.lower, ua->sr.upper);
+ sr = tipc_service_find_range(sc, ua);
if (!sr)
goto exit;
p = tipc_service_remove_publ(sr, ua, sk, key);
--
2.28.0
_______________________________________________
tipc-discussion mailing list
tipc-discussion@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tipc-discussion
