vlan: Match underlying dev carrier on vlan add

When adding a new vlan, if the underlying interface has no carrier, then the newly added vlan interface should also have no carrier. At present, this is not true - the newly added vlan is added with carrier up. Fix by checking state of real device. Signed-off-by: Phil Oester <[email protected]> Signed-off-by: David S. Miller <[email protected]>
ambv · Aug 19, 2010 · 0ac820e · 0ac820e
1 parent 0645bab
commit 0ac820e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
@@ -510,7 +510,8 @@ static int vlan_dev_open(struct net_device *dev)
 	if (vlan->flags & VLAN_FLAG_GVRP)
 		vlan_gvrp_request_join(dev);
 
-	netif_carrier_on(dev);
+	if (netif_carrier_ok(real_dev))
+		netif_carrier_on(dev);
 	return 0;
 
 clear_allmulti: