From: Allan Stephens Date: Wed, 19 Oct 2011 18:58:29 +0000 (-0400) Subject: tipc: Minor optimization to deactivation of Ethernet media suppot X-Git-Tag: v3.3-rc1~182^2~108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c12118db77dce5a7abf1a0e87af56592fdd7c09;p=profile%2Fcommon%2Fkernel-common.git 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 Signed-off-by: Paul Gortmaker --- diff --git a/net/tipc/core.c b/net/tipc/core.c index c21331d..2691cd5 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 3b75c0d..23bf67b 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(¬ifier); 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(ð_bearers[i].tipc_packet_type); dev_put(eth_bearers[i].dev);