diff options
Diffstat (limited to 'net/tipc/bcast.c')
| -rw-r--r-- | net/tipc/bcast.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 0d4402587fdf..bf860d9e75af 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
| @@ -621,12 +621,6 @@ static int tipc_bcbearer_send(struct sk_buff *buf, struct tipc_bearer *unused1, | |||
| 621 | if (!p) | 621 | if (!p) |
| 622 | break; /* No more bearers to try */ | 622 | break; /* No more bearers to try */ |
| 623 | 623 | ||
| 624 | if (tipc_bearer_blocked(p)) { | ||
| 625 | if (!s || tipc_bearer_blocked(s)) | ||
| 626 | continue; /* Can't use either bearer */ | ||
| 627 | b = s; | ||
| 628 | } | ||
| 629 | |||
| 630 | tipc_nmap_diff(&bcbearer->remains, &b->nodes, | 624 | tipc_nmap_diff(&bcbearer->remains, &b->nodes, |
| 631 | &bcbearer->remains_new); | 625 | &bcbearer->remains_new); |
| 632 | if (bcbearer->remains_new.count == bcbearer->remains.count) | 626 | if (bcbearer->remains_new.count == bcbearer->remains.count) |
| @@ -800,7 +794,7 @@ void tipc_bclink_init(void) | |||
| 800 | void tipc_bclink_stop(void) | 794 | void tipc_bclink_stop(void) |
| 801 | { | 795 | { |
| 802 | spin_lock_bh(&bc_lock); | 796 | spin_lock_bh(&bc_lock); |
| 803 | tipc_link_stop(bcl); | 797 | tipc_link_purge_queues(bcl); |
| 804 | spin_unlock_bh(&bc_lock); | 798 | spin_unlock_bh(&bc_lock); |
| 805 | 799 | ||
| 806 | memset(bclink, 0, sizeof(*bclink)); | 800 | memset(bclink, 0, sizeof(*bclink)); |
