mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
bridge: Optimize multiple unregistration
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:
parent
59fd5d87a4
commit
8c56ba0530
1 changed files with 9 additions and 10 deletions
|
@ -154,7 +154,7 @@ static void del_nbp(struct net_bridge_port *p)
|
|||
}
|
||||
|
||||
/* 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;
|
||||
|
||||
|
@ -165,7 +165,7 @@ static void del_br(struct net_bridge *br)
|
|||
del_timer_sync(&br->gc_timer);
|
||||
|
||||
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)
|
||||
|
@ -323,7 +323,7 @@ int br_del_bridge(struct net *net, const char *name)
|
|||
}
|
||||
|
||||
else
|
||||
del_br(netdev_priv(dev));
|
||||
del_br(netdev_priv(dev), NULL);
|
||||
|
||||
rtnl_unlock();
|
||||
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)
|
||||
{
|
||||
struct net_device *dev;
|
||||
LIST_HEAD(list);
|
||||
|
||||
rtnl_lock();
|
||||
restart:
|
||||
for_each_netdev(net, dev) {
|
||||
if (dev->priv_flags & IFF_EBRIDGE) {
|
||||
del_br(netdev_priv(dev));
|
||||
goto restart;
|
||||
}
|
||||
}
|
||||
for_each_netdev(net, dev)
|
||||
if (dev->priv_flags & IFF_EBRIDGE)
|
||||
del_br(netdev_priv(dev), &list);
|
||||
|
||||
unregister_netdevice_many(&list);
|
||||
rtnl_unlock();
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue