aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bcast.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r--net/tipc/bcast.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 41ecf313073c..e00441a2092f 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -256,7 +256,7 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)
256 if (bcbuf_acks(crs) == 0) { 256 if (bcbuf_acks(crs) == 0) {
257 bcl->first_out = next; 257 bcl->first_out = next;
258 bcl->out_queue_size--; 258 bcl->out_queue_size--;
259 buf_discard(crs); 259 kfree_skb(crs);
260 released = 1; 260 released = 1;
261 } 261 }
262 crs = next; 262 crs = next;
@@ -330,7 +330,7 @@ void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent)
330 tipc_bearer_send(&bcbearer->bearer, buf, NULL); 330 tipc_bearer_send(&bcbearer->bearer, buf, NULL);
331 bcl->stats.sent_nacks++; 331 bcl->stats.sent_nacks++;
332 spin_unlock_bh(&bc_lock); 332 spin_unlock_bh(&bc_lock);
333 buf_discard(buf); 333 kfree_skb(buf);
334 334
335 n_ptr->bclink.oos_state++; 335 n_ptr->bclink.oos_state++;
336 } 336 }
@@ -374,7 +374,7 @@ int tipc_bclink_send_msg(struct sk_buff *buf)
374 374
375 if (!bclink->bcast_nodes.count) { 375 if (!bclink->bcast_nodes.count) {
376 res = msg_data_sz(buf_msg(buf)); 376 res = msg_data_sz(buf_msg(buf));
377 buf_discard(buf); 377 kfree_skb(buf);
378 goto exit; 378 goto exit;
379 } 379 }
380 380
@@ -480,7 +480,7 @@ receive:
480 if (likely(msg_mcast(msg))) 480 if (likely(msg_mcast(msg)))
481 tipc_port_recv_mcast(buf, NULL); 481 tipc_port_recv_mcast(buf, NULL);
482 else 482 else
483 buf_discard(buf); 483 kfree_skb(buf);
484 } else if (msg_user(msg) == MSG_BUNDLER) { 484 } else if (msg_user(msg) == MSG_BUNDLER) {
485 spin_lock_bh(&bc_lock); 485 spin_lock_bh(&bc_lock);
486 bclink_accept_pkt(node, seqno); 486 bclink_accept_pkt(node, seqno);
@@ -513,7 +513,7 @@ receive:
513 bclink_accept_pkt(node, seqno); 513 bclink_accept_pkt(node, seqno);
514 spin_unlock_bh(&bc_lock); 514 spin_unlock_bh(&bc_lock);
515 tipc_node_unlock(node); 515 tipc_node_unlock(node);
516 buf_discard(buf); 516 kfree_skb(buf);
517 } 517 }
518 buf = NULL; 518 buf = NULL;
519 519
@@ -569,7 +569,7 @@ receive:
569unlock: 569unlock:
570 tipc_node_unlock(node); 570 tipc_node_unlock(node);
571exit: 571exit:
572 buf_discard(buf); 572 kfree_skb(buf);
573} 573}
574 574
575u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr) 575u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr)