From 1192d7ad8164ae4ad2916836b6c5c096f8f94548 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Wed, 19 Oct 2011 14:58:29 -0400
Subject: [PATCH] --- yaml --- r: 279095 b: refs/heads/master c:
 8c12118db77dce5a7abf1a0e87af56592fdd7c09 h: refs/heads/master i:   279093:
 5947a4d2923e081c272552ce94d0ec0de6c360a4   279091:
 8895a43d1b881917821546e068e7facce9a948a7   279087:
 a947243bd87458dd792f7dc70c2488bf8b2b063f v: v3

---
 [refs]                     | 2 +-
 trunk/net/tipc/core.c      | 2 +-
 trunk/net/tipc/eth_media.c | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 442856db94bb..561ab469c6c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfec73d7e45cdf570d649a547050295789e1e6fb
+refs/heads/master: 8c12118db77dce5a7abf1a0e87af56592fdd7c09
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index c21331d58fdb..2691cd57b8a8 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/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/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c
index 3b75c0d656d9..23bf67b1f010 100644
--- a/trunk/net/tipc/eth_media.c
+++ b/trunk/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);