diff options
Diffstat (limited to 'net/tipc/server.c')
-rw-r--r-- | net/tipc/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index 5d231fa8e4b5..6a18b10ac271 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c | |||
@@ -203,7 +203,7 @@ static void tipc_con_delete_sub(struct tipc_conn *con, struct tipc_subscr *s) | |||
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, subscrp_list) { |
205 | if (!s || !memcmp(s, &sub->evt.s, sizeof(*s))) | 205 | if (!s || !memcmp(s, &sub->evt.s, sizeof(*s))) |
206 | tipc_sub_delete(sub); | 206 | tipc_sub_unsubscribe(sub); |
207 | else if (s) | 207 | else if (s) |
208 | break; | 208 | break; |
209 | } | 209 | } |
@@ -278,7 +278,7 @@ static int tipc_con_rcv_sub(struct tipc_server *srv, | |||
278 | tipc_con_delete_sub(con, s); | 278 | tipc_con_delete_sub(con, s); |
279 | return 0; | 279 | return 0; |
280 | } | 280 | } |
281 | sub = tipc_subscrp_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 | 284 | ||