You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.2 KiB
57 lines
2.2 KiB
From fc8d11f19c19a9b47cf8d253a6f163a163511e66 Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:36:26 -0500
|
|
Subject: [PATCH 009/139] [netdrv] net: aquantia: fix removal of vlan 0
|
|
|
|
Message-id: <1604687916-15087-10-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338433
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 009/139] net: aquantia: fix removal of vlan 0
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit 6fdc060d7476ef73c8029b652d252c1a7b4de948
|
|
Author: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
|
|
Date: Fri Aug 30 12:08:30 2019 +0000
|
|
|
|
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>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/aq_filters.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
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;
|
|
--
|
|
2.13.6
|
|
|