Pārlūkot izejas kodu

net: speedup netdev_set_master()

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>
Eric Dumazet 15 gadi atpakaļ
vecāks
revīzija
283f2fe87e
1 mainītis faili ar 3 papildinājumiem un 4 dzēšanām
  1. 3 4
      net/core/dev.c

+ 3 - 4
net/core/dev.c

@@ -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)
+	if (old) {
+		synchronize_net();
 		dev_put(old);
 		dev_put(old);
-
+	}
 	if (master)
 	if (master)
 		slave->flags |= IFF_SLAVE;
 		slave->flags |= IFF_SLAVE;
 	else
 	else