diff options
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r-- | net/tipc/bcast.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index e7880172ef19..b1ff16aa4bdb 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -276,7 +276,7 @@ static void bclink_send_nack(struct node *n_ptr) | |||
276 | if (buf) { | 276 | if (buf) { |
277 | msg = buf_msg(buf); | 277 | msg = buf_msg(buf); |
278 | msg_init(msg, BCAST_PROTOCOL, STATE_MSG, | 278 | msg_init(msg, BCAST_PROTOCOL, STATE_MSG, |
279 | TIPC_OK, INT_H_SIZE, n_ptr->addr); | 279 | INT_H_SIZE, n_ptr->addr); |
280 | msg_set_mc_netid(msg, tipc_net_id); | 280 | msg_set_mc_netid(msg, tipc_net_id); |
281 | msg_set_bcast_ack(msg, mod(n_ptr->bclink.last_in)); | 281 | msg_set_bcast_ack(msg, mod(n_ptr->bclink.last_in)); |
282 | msg_set_bcgap_after(msg, n_ptr->bclink.gap_after); | 282 | msg_set_bcgap_after(msg, n_ptr->bclink.gap_after); |
@@ -571,7 +571,7 @@ static int tipc_bcbearer_send(struct sk_buff *buf, | |||
571 | assert(tipc_cltr_bcast_nodes.count != 0); | 571 | assert(tipc_cltr_bcast_nodes.count != 0); |
572 | bcbuf_set_acks(buf, tipc_cltr_bcast_nodes.count); | 572 | bcbuf_set_acks(buf, tipc_cltr_bcast_nodes.count); |
573 | msg = buf_msg(buf); | 573 | msg = buf_msg(buf); |
574 | msg_set_non_seq(msg); | 574 | msg_set_non_seq(msg, 1); |
575 | msg_set_mc_netid(msg, tipc_net_id); | 575 | msg_set_mc_netid(msg, tipc_net_id); |
576 | } | 576 | } |
577 | 577 | ||
@@ -611,7 +611,7 @@ swap: | |||
611 | bcbearer->bpairs[bp_index].secondary = p; | 611 | bcbearer->bpairs[bp_index].secondary = p; |
612 | update: | 612 | update: |
613 | if (bcbearer->remains_new.count == 0) | 613 | if (bcbearer->remains_new.count == 0) |
614 | return TIPC_OK; | 614 | return 0; |
615 | 615 | ||
616 | bcbearer->remains = bcbearer->remains_new; | 616 | bcbearer->remains = bcbearer->remains_new; |
617 | } | 617 | } |
@@ -620,7 +620,7 @@ update: | |||
620 | 620 | ||
621 | bcbearer->bearer.publ.blocked = 1; | 621 | bcbearer->bearer.publ.blocked = 1; |
622 | bcl->stats.bearer_congs++; | 622 | bcl->stats.bearer_congs++; |
623 | return ~TIPC_OK; | 623 | return 1; |
624 | } | 624 | } |
625 | 625 | ||
626 | /** | 626 | /** |
@@ -756,7 +756,7 @@ int tipc_bclink_reset_stats(void) | |||
756 | spin_lock_bh(&bc_lock); | 756 | spin_lock_bh(&bc_lock); |
757 | memset(&bcl->stats, 0, sizeof(bcl->stats)); | 757 | memset(&bcl->stats, 0, sizeof(bcl->stats)); |
758 | spin_unlock_bh(&bc_lock); | 758 | spin_unlock_bh(&bc_lock); |
759 | return TIPC_OK; | 759 | return 0; |
760 | } | 760 | } |
761 | 761 | ||
762 | int tipc_bclink_set_queue_limits(u32 limit) | 762 | int tipc_bclink_set_queue_limits(u32 limit) |
@@ -769,7 +769,7 @@ int tipc_bclink_set_queue_limits(u32 limit) | |||
769 | spin_lock_bh(&bc_lock); | 769 | spin_lock_bh(&bc_lock); |
770 | tipc_link_set_queue_limits(bcl, limit); | 770 | tipc_link_set_queue_limits(bcl, limit); |
771 | spin_unlock_bh(&bc_lock); | 771 | spin_unlock_bh(&bc_lock); |
772 | return TIPC_OK; | 772 | return 0; |
773 | } | 773 | } |
774 | 774 | ||
775 | int tipc_bclink_init(void) | 775 | int tipc_bclink_init(void) |
@@ -810,7 +810,7 @@ int tipc_bclink_init(void) | |||
810 | tipc_printbuf_init(&bcl->print_buf, pb, BCLINK_LOG_BUF_SIZE); | 810 | tipc_printbuf_init(&bcl->print_buf, pb, BCLINK_LOG_BUF_SIZE); |
811 | } | 811 | } |
812 | 812 | ||
813 | return TIPC_OK; | 813 | return 0; |
814 | } | 814 | } |
815 | 815 | ||
816 | void tipc_bclink_stop(void) | 816 | void tipc_bclink_stop(void) |