From 8b97fc9ae32281bbaa4da4c271e61a5c91dc505b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sat, 10 Nov 2007 21:51:40 -0800
Subject: [PATCH] --- yaml --- r: 73524 b: refs/heads/master c:
 d932e04a5e7b146c5f9bf517714b986a432a7594 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 58f28a342e50..5aba05e3b4ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 358352b8b83c67ecf75f6d7bc3e2d64bf0cf506a
+refs/heads/master: d932e04a5e7b146c5f9bf517714b986a432a7594
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 1037748c14db..0fadbc6fbc3f 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -636,6 +636,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 			if (!vlandev)
 				continue;
 
+			flgs = vlandev->flags;
+			if (!(flgs & IFF_UP))
+				continue;
+
 			vlan_sync_address(dev, vlandev);
 		}
 		break;