---

yaml --- r: 209850 b: refs/heads/master c: 0ac820e h: refs/heads/master v: v3
git-mirror · Aug 19, 2010 · d15c800 · d15c800
1 parent 7ff622d
commit d15c800
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0645bab7da3cb021157e5c661ef35f1d1226785a
+refs/heads/master: 0ac820eebe9008094040955d294ef7b33b418413
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/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: