Merge commit 'v3.14' into next

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,
                 if (!p)
                         break; /* No more bearers to try */
 
-                if (tipc_bearer_blocked(p)) {
-                        if (!s || tipc_bearer_blocked(s))
-                                continue; /* Can't use either bearer */
-                        b = s;
-                }
-
                 tipc_nmap_diff(&bcbearer->remains, &b->nodes,
                                &bcbearer->remains_new);
                 if (bcbearer->remains_new.count == bcbearer->remains.count)
@@ -800,7 +794,7 @@ void tipc_bclink_init(void)
 void tipc_bclink_stop(void)
 {
         spin_lock_bh(&bc_lock);
-        tipc_link_stop(bcl);
+        tipc_link_purge_queues(bcl);
         spin_unlock_bh(&bc_lock);
 
         memset(bclink, 0, sizeof(*bclink));