Revert "net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()"

This reverts commit 53a85c3.

This patch was not backported correctly and introduced the following
warning:

    net/8021q/vlan_core.c:332:61: warning: passing argument 2 of 'vlan_hw_filter_capable' makes pointer from
    integer without a cast [-Wint-conversion]

The problem is that commit 9daae9b
("net: Call add/kill vid ndo on vlan filter feature toggling") from
v4.17 changed the signature of vlan_hw_filter_capable():

    -static bool vlan_hw_filter_capable(const struct net_device *dev,
    -                                    const struct vlan_vid_info
    				     *vid_info)
    +bool vlan_hw_filter_capable(const struct net_device *dev, __be16 proto)
     {

Revert this change so we can apply a correct backport.

Signed-off-by: Vegard Nossum <[email protected]>

Author: vegard

net/8021q/vlan_core.c

@@ -329,8 +329,6 @@ int vlan_vids_add_by_dev(struct net_device *dev,
 		return 0;
 
 	list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
-		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
-			continue;
 		err = vlan_vid_add(dev, vid_info->proto, vid_info->vid);
 		if (err)
 			goto unwind;
@@ -341,8 +339,6 @@ int vlan_vids_add_by_dev(struct net_device *dev,
 	list_for_each_entry_continue_reverse(vid_info,
 					     &vlan_info->vid_list,
 					     list) {
-		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
-			continue;
 		vlan_vid_del(dev, vid_info->proto, vid_info->vid);
 	}
 
@@ -362,11 +358,8 @@ void vlan_vids_del_by_dev(struct net_device *dev,
 	if (!vlan_info)
 		return;
 
-	list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
-		if (!vlan_hw_filter_capable(by_dev, vid_info->proto))
-			continue;
+	list_for_each_entry(vid_info, &vlan_info->vid_list, list)
 		vlan_vid_del(dev, vid_info->proto, vid_info->vid);
-	}
 }
 EXPORT_SYMBOL(vlan_vids_del_by_dev);