diff options
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r-- | net/tipc/core.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index e2491b341edb..50d57429ebca 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -50,7 +50,6 @@ int tipc_random __read_mostly; | |||
50 | u32 tipc_own_addr __read_mostly; | 50 | u32 tipc_own_addr __read_mostly; |
51 | int tipc_max_ports __read_mostly; | 51 | int tipc_max_ports __read_mostly; |
52 | int tipc_net_id __read_mostly; | 52 | int tipc_net_id __read_mostly; |
53 | int tipc_remote_management __read_mostly; | ||
54 | int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ | 53 | int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ |
55 | 54 | ||
56 | /** | 55 | /** |
@@ -85,7 +84,6 @@ static void tipc_core_stop(void) | |||
85 | tipc_net_stop(); | 84 | tipc_net_stop(); |
86 | tipc_bearer_cleanup(); | 85 | tipc_bearer_cleanup(); |
87 | tipc_netlink_stop(); | 86 | tipc_netlink_stop(); |
88 | tipc_cfg_stop(); | ||
89 | tipc_subscr_stop(); | 87 | tipc_subscr_stop(); |
90 | tipc_nametbl_stop(); | 88 | tipc_nametbl_stop(); |
91 | tipc_ref_table_stop(); | 89 | tipc_ref_table_stop(); |
@@ -130,18 +128,12 @@ static int tipc_core_start(void) | |||
130 | if (err) | 128 | if (err) |
131 | goto out_subscr; | 129 | goto out_subscr; |
132 | 130 | ||
133 | err = tipc_cfg_init(); | ||
134 | if (err) | ||
135 | goto out_cfg; | ||
136 | |||
137 | err = tipc_bearer_setup(); | 131 | err = tipc_bearer_setup(); |
138 | if (err) | 132 | if (err) |
139 | goto out_bearer; | 133 | goto out_bearer; |
140 | 134 | ||
141 | return 0; | 135 | return 0; |
142 | out_bearer: | 136 | out_bearer: |
143 | tipc_cfg_stop(); | ||
144 | out_cfg: | ||
145 | tipc_subscr_stop(); | 137 | tipc_subscr_stop(); |
146 | out_subscr: | 138 | out_subscr: |
147 | tipc_unregister_sysctl(); | 139 | tipc_unregister_sysctl(); |
@@ -166,7 +158,6 @@ static int __init tipc_init(void) | |||
166 | pr_info("Activated (version " TIPC_MOD_VER ")\n"); | 158 | pr_info("Activated (version " TIPC_MOD_VER ")\n"); |
167 | 159 | ||
168 | tipc_own_addr = 0; | 160 | tipc_own_addr = 0; |
169 | tipc_remote_management = 1; | ||
170 | tipc_max_ports = CONFIG_TIPC_PORTS; | 161 | tipc_max_ports = CONFIG_TIPC_PORTS; |
171 | tipc_net_id = 4711; | 162 | tipc_net_id = 4711; |
172 | 163 | ||