---

yaml --- r: 312019 b: refs/heads/master c: efc73f4 h: refs/heads/master i: 312017: a4509e3 312015: 43bf77a v: v3
git-mirror · Jul 11, 2012 · 0a5fab1 · 0a5fab1
1 parent 2ee8a45
commit 0a5fab1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);