From: Or Gerlitz Date: Sun, 8 Apr 2018 06:45:32 +0000 (+0300) Subject: net/mlx5e: Remove double defined DMAC header re-write element X-Git-Tag: v4.18-rc1~114^2~238^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4601266095501d2af4a877f6ee0ecf18af8cdcd8;p=thirdparty%2Fkernel%2Flinux.git net/mlx5e: Remove double defined DMAC header re-write element The firmware DMAC_47_16 header re-write token was defined twice, clean it up. Signed-off-by: Or Gerlitz Reported-by: Jianbo Liu Reviewed-by: Jianbo Liu Signed-off-by: Saeed Mahameed --- diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 9b0e3ccffa66e..969a1768da715 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1579,7 +1579,6 @@ struct mlx5_fields { {MLX5_ACTION_IN_FIELD_OUT_ ## fw_field, size, offsetof(struct pedit_headers, field) + (off)} static struct mlx5_fields fields[] = { - OFFLOAD(DMAC_47_16, 4, eth.h_dest[0], 0), OFFLOAD(DMAC_47_16, 4, eth.h_dest[0], 0), OFFLOAD(DMAC_15_0, 2, eth.h_dest[4], 0), OFFLOAD(SMAC_47_16, 4, eth.h_source[0], 0),