GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bridge: Optimize multiple unregistration

Browse source 
Speedup module unloading by factorizing synchronize_rcu() calls

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-10-28 05:35:35 +00:00 • committed by David S. Miller
parent 59fd5d87a4
commit 8c56ba0530
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/bridge/br_if.c
View file

@ -154,7 +154,7 @@ static void del_nbp(struct net_bridge_port *p)
} }
/* called with RTNL */ /* called with RTNL */
static void del_br(struct net_bridge *br) static void del_br(struct net_bridge *br, struct list_head *head)
{ {
struct net_bridge_port *p, *n; struct net_bridge_port *p, *n;
@ -165,7 +165,7 @@ static void del_br(struct net_bridge *br)
del_timer_sync(&br->gc_timer); del_timer_sync(&br->gc_timer);
br_sysfs_delbr(br->dev); br_sysfs_delbr(br->dev);
unregister_netdevice(br->dev); unregister_netdevice_queue(br->dev, head);
} }
static struct net_device *new_bridge_dev(struct net *net, const char *name) static struct net_device *new_bridge_dev(struct net *net, const char *name)
@ -323,7 +323,7 @@ int br_del_bridge(struct net *net, const char *name)
} }
else else
del_br(netdev_priv(dev)); del_br(netdev_priv(dev), NULL);
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
@ -462,15 +462,14 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
void br_net_exit(struct net *net) void br_net_exit(struct net *net)
{ {
struct net_device *dev; struct net_device *dev;
LIST_HEAD(list);
rtnl_lock(); rtnl_lock();
restart: for_each_netdev(net, dev)
for_each_netdev(net, dev) { if (dev->priv_flags & IFF_EBRIDGE)
if (dev->priv_flags & IFF_EBRIDGE) { del_br(netdev_priv(dev), &list);
del_br(netdev_priv(dev));
goto restart; unregister_netdevice_many(&list);
}
}
rtnl_unlock(); rtnl_unlock();
} }