From d15c800bbc13550caa299e43d7a0f240cfb5d45e Mon Sep 17 00:00:00 2001
From: Phil Oester <kernel@linuxace.com>
Date: Tue, 17 Aug 2010 18:45:08 +0000
Subject: [PATCH] --- yaml --- r: 209850 b: refs/heads/master c:
 0ac820eebe9008094040955d294ef7b33b418413 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlan_dev.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4162d4eb4829..21959b15c68b 100644
--- 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
index 3d59c9bf8feb..3bccdd12a264 100644
--- 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: