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.
68 lines
2.7 KiB
68 lines
2.7 KiB
4 years ago
|
From 91d4bbe4a335c6433b77844c4d56fe858d3528d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 19 May 2020 07:49:23 -0400
|
||
|
|
Subject: [PATCH 261/312] [netdrv] net/mlx5e: CT: remove set but not used
|
||
|
|
variable 'unnew'
|
||
|
|
|
||
|
|
Message-id: <20200519074934.6303-53-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 310547
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1663246 52/63] net/mlx5e: CT: remove set but not used variable 'unnew'
|
||
|
|
Bugzilla: 1663246
|
||
|
|
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
||
|
|
RH-Acked-by: Ivan Vecera <ivecera@redhat.com>
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1663246
|
||
|
|
Upstream: v5.7-rc1
|
||
|
|
|
||
|
|
commit 35e725e1b9d645cc412e06bbc204d63dddb1512b
|
||
|
|
Author: YueHaibing <yuehaibing@huawei.com>
|
||
|
|
Date: Sat Mar 14 18:44:46 2020 +0800
|
||
|
|
|
||
|
|
net/mlx5e: CT: remove set but not used variable 'unnew'
|
||
|
|
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c:
|
||
|
|
In function mlx5_tc_ct_parse_match:
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c:699:36: warning:
|
||
|
|
variable unnew set but not used [-Wunused-but-set-variable]
|
||
|
|
|
||
|
|
Fixes: 4c3844d9e97e ("net/mlx5e: CT: Introduce connection tracking")
|
||
|
|
Reported-by: Hulk Robot <hulkci@huawei.com>
|
||
|
|
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
|
||
|
|
index 8281dfab5e14..003079b09b67 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
|
||
|
|
@@ -699,7 +699,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,
|
||
|
|
{
|
||
|
|
struct mlx5_tc_ct_priv *ct_priv = mlx5_tc_ct_get_ct_priv(priv);
|
||
|
|
struct flow_dissector_key_ct *mask, *key;
|
||
|
|
- bool trk, est, untrk, unest, new, unnew;
|
||
|
|
+ bool trk, est, untrk, unest, new;
|
||
|
|
u32 ctstate = 0, ctstate_mask = 0;
|
||
|
|
u16 ct_state_on, ct_state_off;
|
||
|
|
u16 ct_state, ct_state_mask;
|
||
|
|
@@ -742,7 +742,6 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,
|
||
|
|
new = ct_state_on & TCA_FLOWER_KEY_CT_FLAGS_NEW;
|
||
|
|
est = ct_state_on & TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED;
|
||
|
|
untrk = ct_state_off & TCA_FLOWER_KEY_CT_FLAGS_TRACKED;
|
||
|
|
- unnew = ct_state_off & TCA_FLOWER_KEY_CT_FLAGS_NEW;
|
||
|
|
unest = ct_state_off & TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED;
|
||
|
|
|
||
|
|
ctstate |= trk ? MLX5_CT_STATE_TRK_BIT : 0;
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|