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.
70 lines
2.6 KiB
70 lines
2.6 KiB
4 years ago
|
From ceab994789c9455111c509858a17cc0513196b03 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Mon, 1 Jun 2020 15:40:54 -0400
|
||
|
|
Subject: [PATCH 299/312] [netdrv] net/mlx5e: en_tc: Fix cast to restricted
|
||
|
|
__be32 warning
|
||
|
|
|
||
|
|
Message-id: <20200601154102.25980-32-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 315736
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1842258 31/39] net/mlx5e: en_tc: Fix cast to restricted __be32 warning
|
||
|
|
Bugzilla: 1842258
|
||
|
|
RH-Acked-by: Honggang Li <honli@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1842258
|
||
|
|
Upstream: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git , branch: master
|
||
|
|
|
||
|
|
commit 58ff18e12c9b3bb860b32e9cac4dc8e12aec2695
|
||
|
|
Author: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
Date: Thu May 28 00:22:12 2020 -0700
|
||
|
|
|
||
|
|
net/mlx5e: en_tc: Fix cast to restricted __be32 warning
|
||
|
|
|
||
|
|
Fixes sparse warnings:
|
||
|
|
warning: cast to restricted __be32
|
||
|
|
warning: restricted __be32 degrades to integer
|
||
|
|
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
Reviewed-by: Mark Bloch <markb@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.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
index 5a15e4630171..d4f2697d84d0 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
@@ -225,8 +225,8 @@ mlx5e_tc_match_to_reg_match(struct mlx5_flow_spec *spec,
|
||
|
|
fmask = headers_c + soffset;
|
||
|
|
fval = headers_v + soffset;
|
||
|
|
|
||
|
|
- mask = cpu_to_be32(mask) >> (32 - (match_len * 8));
|
||
|
|
- data = cpu_to_be32(data) >> (32 - (match_len * 8));
|
||
|
|
+ mask = (__force u32)(cpu_to_be32(mask)) >> (32 - (match_len * 8));
|
||
|
|
+ data = (__force u32)(cpu_to_be32(data)) >> (32 - (match_len * 8));
|
||
|
|
|
||
|
|
memcpy(fmask, &mask, match_len);
|
||
|
|
memcpy(fval, &data, match_len);
|
||
|
|
@@ -2725,10 +2725,10 @@ static int offload_pedit_fields(struct mlx5e_priv *priv,
|
||
|
|
continue;
|
||
|
|
|
||
|
|
if (f->field_bsize == 32) {
|
||
|
|
- mask_be32 = (__be32)mask;
|
||
|
|
+ mask_be32 = (__force __be32)(mask);
|
||
|
|
mask = (__force unsigned long)cpu_to_le32(be32_to_cpu(mask_be32));
|
||
|
|
} else if (f->field_bsize == 16) {
|
||
|
|
- mask_be32 = (__be32)mask;
|
||
|
|
+ mask_be32 = (__force __be32)(mask);
|
||
|
|
mask_be16 = *(__be16 *)&mask_be32;
|
||
|
|
mask = (__force unsigned long)cpu_to_le16(be16_to_cpu(mask_be16));
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|