Commit 6fdc060d authored Aug 30, 2019 by Dmitry Bogdanov Committed by David S. Miller Aug 31, 2019

net: aquantia: fix removal of vlan 0

Due to absence of checking against the rx flow rule when vlan 0 is being
removed, the other rule could be removed instead of the rule with vlan 0

Fixes: 7975d2af ("net: aquantia: add support of rx-vlan-filter offload")
Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 154f4fb7

drivers/net/ethernet/aquantia/atlantic/aq_filters.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -431,7 +431,8 @@ int aq_del_fvlan_by_vlan(struct aq_nic_s *aq_nic, u16 vlan_id)
		if (be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id)
		break;
		}
		if (rule && be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) {
		if (rule && rule->type == aq_rx_filter_vlan &&
		be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) {
		struct ethtool_rxnfc cmd;

		cmd.fs.location = rule->aq_fsp.location;