net/mlx5e: en_tc: Fix cast to restricted __be32 warning (58ff18e1) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -210,8 +210,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);
		@@ -2815,10 +2815,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));
		}