diff options
| author |   Dmitry Bogdanov <dmitry.bogdanov@aquantia.com> | 2019-08-30 12:08:30 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-31 19:07:10 -0700 |
| commit | 6fdc060d7476ef73c8029b652d252c1a7b4de948 (patch) | |
| tree | 2662f6645eba7c419eb13ba78c43e2e87c36e39f /drivers/net/ethernet/aquantia/atlantic/aq_filters.c | |
| parent | Merge branch 'Fix-issues-in-tc-taprio-and-tc-cbs' (diff) | |
| download | linux-dev-6fdc060d7476ef73c8029b652d252c1a7b4de948.tar.xz linux-dev-6fdc060d7476ef73c8029b652d252c1a7b4de948.zip | |
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: 7975d2aff5afb ("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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_filters.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c index 440690b18734..b13704544a23 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c @@ -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; |