tipc: some prefix changes

Since we now have removed struct tipc_subscriber from the code, and
only struct tipc_subscription remains, there is no longer need for long
and awkward prefixes to distinguish between their pertaining functions.

We now change all tipc_subscrp_* prefixes to tipc_sub_*. This is
a purely cosmetic change.

Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/tipc/server.c b/net/tipc/server.c
index 6a18b10ac271..a5c112ed3bbe 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -201,7 +201,7 @@ static void tipc_con_delete_sub(struct tipc_conn *con, struct tipc_subscr *s)
         struct tipc_subscription *sub, *tmp;
 
         spin_lock_bh(&con->sub_lock);
-        list_for_each_entry_safe(sub, tmp, sub_list, subscrp_list) {
+        list_for_each_entry_safe(sub, tmp, sub_list, sub_list) {
                 if (!s || !memcmp(s, &sub->evt.s, sizeof(*s)))
                         tipc_sub_unsubscribe(sub);
                 else if (s)
@@ -281,9 +281,8 @@ static int tipc_con_rcv_sub(struct tipc_server *srv,
         sub = tipc_sub_subscribe(srv, s, con->conid);
         if (!sub)
                 return -1;
-
         spin_lock_bh(&con->sub_lock);
-        list_add(&sub->subscrp_list, &con->sub_list);
+        list_add(&sub->sub_list, &con->sub_list);
         spin_unlock_bh(&con->sub_lock);
         return 0;
 }