Commit 8c12118d authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker

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: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent bfec73d7
...@@ -99,8 +99,8 @@ struct sk_buff *tipc_buf_acquire(u32 size) ...@@ -99,8 +99,8 @@ struct sk_buff *tipc_buf_acquire(u32 size)
static void tipc_core_stop_net(void) static void tipc_core_stop_net(void)
{ {
tipc_eth_media_stop();
tipc_net_stop(); tipc_net_stop();
tipc_eth_media_stop();
} }
/** /**
......
...@@ -376,10 +376,6 @@ void tipc_eth_media_stop(void) ...@@ -376,10 +376,6 @@ void tipc_eth_media_stop(void)
unregister_netdevice_notifier(&notifier); unregister_netdevice_notifier(&notifier);
for (i = 0; i < MAX_ETH_BEARERS ; i++) { 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) { if (eth_bearers[i].dev) {
dev_remove_pack(&eth_bearers[i].tipc_packet_type); dev_remove_pack(&eth_bearers[i].tipc_packet_type);
dev_put(eth_bearers[i].dev); dev_put(eth_bearers[i].dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment