diff options
| author | David S. Miller | 2019-07-12 00:04:39 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-12 00:04:39 +0200 |
| commit | 08d14c49ac949b0e42f2aa36fb8d5c860cfe130d (patch) | |
| tree | cd0e5b09a03563f06cb153203d1680f4ea5d27e3 /drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | |
| parent | ipv6: fix static key imbalance in fl_create() (diff) | |
| parent | net/mlx5: E-Switch, Reduce ingress acl modify metadata stack usage (diff) | |
| download | kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.tar.gz kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.tar.xz kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.zip | |
Merge branch 'mlx5-build-fixes'
Saeed Mahameed says:
====================
Mellanox, mlx5 build fixes
I know net-next is closed but these patches are fixing some compiler
build and warnings issues people have been complaining about.
I hope it is not too late, but in case it is a lot of trouble for you,
I guess they can wait.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 8ed4497929b9..5f78e76019c5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -1785,8 +1785,8 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw, struct mlx5_vport *vport) { u8 action[MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto)] = {}; + static const struct mlx5_flow_spec spec = {}; struct mlx5_flow_act flow_act = {}; - struct mlx5_flow_spec spec = {}; int err = 0; MLX5_SET(set_action_in, action, action_type, MLX5_ACTION_TYPE_SET); |