Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / tipc / core.c

diff --git a/net/tipc/core.c b/net/tipc/core.c
index fc05cecd7481652dd57431727dc2355d39627859..7ec2c1eb94f17a40db04bb004a6abf35f2fc25cf 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -82,6 +82,7 @@ static void tipc_core_stop_net(void)
 {
        tipc_net_stop();
        tipc_eth_media_stop();
+       tipc_ib_media_stop();
 }
 
 /**
@@ -93,8 +94,15 @@ int tipc_core_start_net(unsigned long addr)
 
        tipc_net_start(addr);
        res = tipc_eth_media_start();
-       if (res)
-               tipc_core_stop_net();
+       if (res < 0)
+               goto err;
+       res = tipc_ib_media_start();
+       if (res < 0)
+               goto err;
+       return res;
+
+err:
+       tipc_core_stop_net();
        return res;
 }