tipc: Minor optimization to deactivation of Ethernet media suppot

Change TIPC's shutdown code to deactivate generic networking support
before terminating Ethernet media support. The deactivation of generic
networking support causes all existing bearers to be destroyed, meaning
the Ethernet media termination routine no longer has to bother marking
them as unavailable.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

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)
 
 static void tipc_core_stop_net(void)
 {
-        tipc_eth_media_stop();
         tipc_net_stop();
+        tipc_eth_media_stop();
 }
 
 /**
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)
 
         unregister_netdevice_notifier(&notifier);
         for (i = 0; i < MAX_ETH_BEARERS ; i++) {
-                if (eth_bearers[i].bearer) {
-                        eth_bearers[i].bearer->blocked = 1;
-                        eth_bearers[i].bearer = NULL;
-                }
                 if (eth_bearers[i].dev) {
                         dev_remove_pack(&eth_bearers[i].tipc_packet_type);
                         dev_put(eth_bearers[i].dev);