diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/core.c | 2 | ||||
-rw-r--r-- | net/tipc/eth_media.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index c21331d58fdb..2691cd57b8a8 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -99,8 +99,8 @@ struct sk_buff *tipc_buf_acquire(u32 size) | |||
99 | 99 | ||
100 | static void tipc_core_stop_net(void) | 100 | static void tipc_core_stop_net(void) |
101 | { | 101 | { |
102 | tipc_eth_media_stop(); | ||
103 | tipc_net_stop(); | 102 | tipc_net_stop(); |
103 | tipc_eth_media_stop(); | ||
104 | } | 104 | } |
105 | 105 | ||
106 | /** | 106 | /** |
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 3b75c0d656d9..23bf67b1f010 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -376,10 +376,6 @@ void tipc_eth_media_stop(void) | |||
376 | 376 | ||
377 | unregister_netdevice_notifier(¬ifier); | 377 | unregister_netdevice_notifier(¬ifier); |
378 | for (i = 0; i < MAX_ETH_BEARERS ; i++) { | 378 | for (i = 0; i < MAX_ETH_BEARERS ; i++) { |
379 | if (eth_bearers[i].bearer) { | ||
380 | eth_bearers[i].bearer->blocked = 1; | ||
381 | eth_bearers[i].bearer = NULL; | ||
382 | } | ||
383 | if (eth_bearers[i].dev) { | 379 | if (eth_bearers[i].dev) { |
384 | dev_remove_pack(ð_bearers[i].tipc_packet_type); | 380 | dev_remove_pack(ð_bearers[i].tipc_packet_type); |
385 | dev_put(eth_bearers[i].dev); | 381 | dev_put(eth_bearers[i].dev); |