diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-12 20:34:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-12 20:34:23 +0100 |
| commit | bf3347c4d15e26ab17fce3aa4041345198f4280c (patch) | |
| tree | e7dca5ea4e7bdb3e5892ab64e0f335f1219595f1 /drivers/infiniband | |
| parent | Merge branch 'bind_addr_zero' (diff) | |
| parent | net/mlx5e: Restore tunnel metadata on miss (diff) | |
| download | linux-bf3347c4d15e26ab17fce3aa4041345198f4280c.tar.xz linux-bf3347c4d15e26ab17fce3aa4041345198f4280c.zip | |
Merge branch 'ct-offload' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index e4bcfa81b70a..4de380f3d581 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -3570,7 +3570,8 @@ static void mlx5_ib_set_rule_source_port(struct mlx5_ib_dev *dev, misc = MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_parameters_2); - MLX5_SET_TO_ONES(fte_match_set_misc2, misc, metadata_reg_c_0); + MLX5_SET(fte_match_set_misc2, misc, metadata_reg_c_0, + mlx5_eswitch_get_vport_metadata_mask()); } else { misc = MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_parameters); |