tipc: make broadcast bearer store in bearer_list array

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

diff --git a/net/tipc/core.c b/net/tipc/core.c
index e2491b341edb16982d2d64a2d4c3883a061d4155..50d57429ebcaf82b8d36bcf49f6fa1585664180a 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -50,7 +50,6 @@ int tipc_random __read_mostly;
 u32 tipc_own_addr __read_mostly;
 int tipc_max_ports __read_mostly;
 int tipc_net_id __read_mostly;
-int tipc_remote_management __read_mostly;
 int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */
 
 /**
@@ -85,7 +84,6 @@ static void tipc_core_stop(void)
        tipc_net_stop();
        tipc_bearer_cleanup();
        tipc_netlink_stop();
-       tipc_cfg_stop();
        tipc_subscr_stop();
        tipc_nametbl_stop();
        tipc_ref_table_stop();
@@ -130,18 +128,12 @@ static int tipc_core_start(void)
        if (err)
                goto out_subscr;
 
-       err = tipc_cfg_init();
-       if (err)
-               goto out_cfg;
-
        err = tipc_bearer_setup();
        if (err)
                goto out_bearer;
 
        return 0;
 out_bearer:
-       tipc_cfg_stop();
-out_cfg:
        tipc_subscr_stop();
 out_subscr:
        tipc_unregister_sysctl();
@@ -166,7 +158,6 @@ static int __init tipc_init(void)
        pr_info("Activated (version " TIPC_MOD_VER ")\n");
 
        tipc_own_addr = 0;
-       tipc_remote_management = 1;
        tipc_max_ports = CONFIG_TIPC_PORTS;
        tipc_net_id = 4711;