summaryrefslogtreecommitdiffstats
path: root/net/tipc/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/server.c')
-rw-r--r--net/tipc/server.c5
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)
201 struct tipc_subscription *sub, *tmp; 201 struct tipc_subscription *sub, *tmp;
202 202
203 spin_lock_bh(&con->sub_lock); 203 spin_lock_bh(&con->sub_lock);
204 list_for_each_entry_safe(sub, tmp, sub_list, subscrp_list) { 204 list_for_each_entry_safe(sub, tmp, sub_list, sub_list) {
205 if (!s || !memcmp(s, &sub->evt.s, sizeof(*s))) 205 if (!s || !memcmp(s, &sub->evt.s, sizeof(*s)))
206 tipc_sub_unsubscribe(sub); 206 tipc_sub_unsubscribe(sub);
207 else if (s) 207 else if (s)
@@ -281,9 +281,8 @@ static int tipc_con_rcv_sub(struct tipc_server *srv,
281 sub = tipc_sub_subscribe(srv, s, con->conid); 281 sub = tipc_sub_subscribe(srv, s, con->conid);
282 if (!sub) 282 if (!sub)
283 return -1; 283 return -1;
284
285 spin_lock_bh(&con->sub_lock); 284 spin_lock_bh(&con->sub_lock);
286 list_add(&sub->subscrp_list, &con->sub_list); 285 list_add(&sub->sub_list, &con->sub_list);
287 spin_unlock_bh(&con->sub_lock); 286 spin_unlock_bh(&con->sub_lock);
288 return 0; 287 return 0;
289} 288}