From f0116f334099ef78b7703ee49c17f93eaa8f1562 Mon Sep 17 00:00:00 2001
From: Tommy Christensen <tommy.christensen@tpack.net>
Date: Tue, 12 Jul 2005 12:13:49 -0700
Subject: [PATCH] --- yaml --- r: 4638 b: refs/heads/master c:
 f4637b55ba960d9987a836617271659e9b7b0de8 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 954aaacd121f..9dc0055a9876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab611487d8ada506e511d2b8f22fb8e7be9939b9
+refs/heads/master: f4637b55ba960d9987a836617271659e9b7b0de8
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 1f6d31670bc7..91e412b0ab00 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -578,6 +578,14 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 			if (!vlandev)
 				continue;
 
+			if (netif_carrier_ok(dev)) {
+				if (!netif_carrier_ok(vlandev))
+					netif_carrier_on(vlandev);
+			} else {
+				if (netif_carrier_ok(vlandev))
+					netif_carrier_off(vlandev);
+			}
+
 			if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) {
 				vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK) 
 					| flgs;