net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*

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

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index f3b6f515eba67bd8e883707521da6ae1e4f64834..3df29d344704a48884e25cc4ad1753f1b716587a 100644 (file)
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -225,7 +225,7 @@ static int __vlan_vid_add(struct vlan_info *vlan_info, unsigned short vid,
        if (!vid_info)
                return -ENOMEM;
 
-       if (dev->features & NETIF_F_HW_VLAN_FILTER) {
+       if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {
                err =  ops->ndo_vlan_rx_add_vid(dev, vid);
                if (err) {
                        kfree(vid_info);
@@ -282,7 +282,7 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
        unsigned short vid = vid_info->vid;
        int err;
 
-       if (dev->features & NETIF_F_HW_VLAN_FILTER) {
+       if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {
                err = ops->ndo_vlan_rx_kill_vid(dev, vid);
                if (err) {
                        pr_warn("failed to kill vid %d for device %s\n",