diff options
author | Paolo Abeni <pabeni@redhat.com> | 2022-08-03 09:50:42 +0300 |
---|---|---|
committer | Paolo Abeni <pabeni@redhat.com> | 2022-08-03 10:04:55 +0300 |
commit | 7c6327c77d509e78bff76f2a4551fcfee851682e (patch) | |
tree | 9e5e128945eadd50462620927ed915fb88fb6eb1 /drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c | |
parent | 6f63d04473f2bc973e24ff828a28a2bd5e41bb38 (diff) | |
parent | 8eaa1d110800fac050bab44001732747a1c39894 (diff) | |
download | linux-7c6327c77d509e78bff76f2a4551fcfee851682e.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
net/ax25/af_ax25.c
d7c4c9e075f8c ("ax25: fix incorrect dev_tracker usage")
d62607c3fe459 ("net: rename reference+tracking helpers")
drivers/net/netdevsim/fib.c
180a6a3ee60a ("netdevsim: fib: Fix reference count leak on route deletion failure")
012ec02ae441 ("netdevsim: convert driver to use unlocked devlink API during init/fini")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c index 33c1411ed8db..4e48946c4c2a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c @@ -128,6 +128,7 @@ mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *at post_attr->inner_match_level = MLX5_MATCH_NONE; post_attr->outer_match_level = MLX5_MATCH_NONE; post_attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_DECAP; + post_attr->flags |= MLX5_ATTR_FLAG_NO_IN_PORT; handle->ns_type = post_act->ns_type; /* Splits were handled before post action */ |