summaryrefslogtreecommitdiff
path: root/include/linux/mlx5/fs.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-05-30 17:53:57 -0700
committerDavid S. Miller <davem@davemloft.net>2020-05-30 17:53:57 -0700
commit4300c7e7fe152be96b41b2135e3ace9a1e8db308 (patch)
tree6317281b4933c74b8716ed6e01dbf4d67d8f8a6d /include/linux/mlx5/fs.h
parentda4e15e31bae16d3a57c9eabe90eb2ab0e40f1a7 (diff)
parenteb24387183d37f2f4f456654ef92679b1556f8df (diff)
downloadlwn-4300c7e7fe152be96b41b2135e3ace9a1e8db308.tar.gz
lwn-4300c7e7fe152be96b41b2135e3ace9a1e8db308.zip
Merge tag 'mlx5-cleanup-2020-05-29' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says: ==================== mlx5-cleanup-2020-05-29 Accumulated cleanup patches and sparse warning fixes for mlx5 driver. 1) sync with mlx5-next branch 2) Eli Cohen declares mpls_entry_encode() helper in mpls.h as suggested by Jakub Kicinski and David Ahern, and use it in mlx5 3) Jesper Fixes xdp data_meta setup in mlx5 4) Many sparse and build warnings cleanup ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx5/fs.h')
-rw-r--r--include/linux/mlx5/fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index e2d13e074067..6c5aa0a21425 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -42,6 +42,7 @@ enum {
MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO = 1 << 16,
MLX5_FLOW_CONTEXT_ACTION_ENCRYPT = 1 << 17,
MLX5_FLOW_CONTEXT_ACTION_DECRYPT = 1 << 18,
+ MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS = 1 << 19,
};
enum {