Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index e40aa3e3641cbf0f5ab4fdd3e374ba9d1ef5a82d..b3662119ddbce2b3f59737e7af1ecb995737cb2e 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -384,8 +384,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                        dev->name);
                vlan_vid_add(dev, htons(ETH_P_8021Q), 0);
        }
-       if (event == NETDEV_DOWN &&
-           (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER))
+       if (event == NETDEV_DOWN)
                vlan_vid_del(dev, htons(ETH_P_8021Q), 0);
 
        vlan_info = rtnl_dereference(dev->vlan_info);