From 0a5fab11d1951f1b303002f3bcccf5c9f1052a3d Mon Sep 17 00:00:00 2001
From: Amir Hanania <amir.hanania@intel.com>
Date: Mon, 9 Jul 2012 20:47:19 +0000
Subject: [PATCH] --- yaml --- r: 312019 b: refs/heads/master c:
 efc73f4bbc238d4f579fb612c04c8e1dd8a82979 h: refs/heads/master i:   312017:
 a4509e3f20d2aefccc933dd3fbfbbc12697fe704   312015:
 43bf77afd339a6c63dfa6134be993161e5553282 v: v3

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

diff --git a/[refs] b/[refs]
index c6e7d9ccda4f..f983c0e61b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 941a46a29c9388f9cef518fa3498329fb55badca
+refs/heads/master: efc73f4bbc238d4f579fb612c04c8e1dd8a82979
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 6089f0cf23b4..9096bcb08132 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -403,6 +403,9 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 		break;
 
 	case NETDEV_DOWN:
+		if (dev->features & NETIF_F_HW_VLAN_FILTER)
+			vlan_vid_del(dev, 0);
+
 		/* Put all VLANs for this dev in the down state too.  */
 		for (i = 0; i < VLAN_N_VID; i++) {
 			vlandev = vlan_group_get_device(grp, i);