Commit 8c56ba05 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

bridge: Optimize multiple unregistration

Speedup module unloading by factorizing synchronize_rcu() calls
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59fd5d87
......@@ -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();
}
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