iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: speedup netdev_set_master()

Browse Source 
We currently force a synchronize_net() in netdev_set_master()

This seems necessary only when a slave had a master and we dismantle it.

In the other case ("ifenslave bond0 ethO"), we dont need this long
delay.

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 2010-03-18 13:37:40 +00:00 committed by David S. Miller
parent 907cdda520
commit 283f2fe87e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/dev.c
View File

@ -3757,11 +3757,10 @@ int netdev_set_master(struct net_device *slave, struct net_device *master)
slave->master = master; slave->master = master;
synchronize_net(); if (old) {
synchronize_net();
if (old)
dev_put(old); dev_put(old);
}
if (master) if (master)
slave->flags |= IFF_SLAVE; slave->flags |= IFF_SLAVE;
else else