From c6e5dda00305f02d1bc80e1ee60f618947f90db1 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 20 May 2008 14:37:36 -0700
Subject: [PATCH] --- yaml --- r: 97098 b: refs/heads/master c:
 81d85346b3fcd8b3167eac8b5fb415a210bd4345 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e3141f663c2a..1bbc84df914f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e91796eb46e29edc791131c832a2232bcaed9dd
+refs/heads/master: 81d85346b3fcd8b3167eac8b5fb415a210bd4345
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 2a739adaa92b..b934159a6f07 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -410,10 +410,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 	int i, flgs;
 	struct net_device *vlandev;
 
-	if (is_vlan_dev(dev)) {
+	if (is_vlan_dev(dev))
 		__vlan_device_event(dev, event);
-		goto out;
-	}
 
 	grp = __vlan_find_group(dev);
 	if (!grp)