Merge branch 'tipc-next'

Erik Hugne says:

====================
tipc: bug fix and some improvements

Most important is a fix for a nullptr exception that would occur when
name table subscriptions fail. The remaining patches are performance
improvements and cosmetic changes.

v2: remove unnecessary whitespace in patch #2
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 48852c2dcc03..af6deeb397a8 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -742,7 +742,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
                 return -EINVAL;
         }
 
-        bearer_disable(net, bearer, false);
+        bearer_disable(net, bearer, true);
         rtnl_unlock();
 
         return 0;