---

yaml --- r: 279095 b: refs/heads/master c: 8c12118 h: refs/heads/master i: 279093: 5947a4d 279091: 8895a43 279087: a947243 v: v3
git-mirror · Dec 27, 2011 · 1192d7a · 1192d7a
1 parent 7d91dd0
commit 1192d7a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);