diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-14 14:14:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-14 14:14:03 -0700 |
| commit | 4a65912fde5b2a0bde4df90426bb8c51a48f1230 (patch) | |
| tree | 9c4c0e377400b9b4a072f2b8e6916d8cab22d2e9 /include | |
| parent | 652d3be21dc838f526c01837cbc837894f9c7bc1 (diff) | |
| parent | 5b232ea94c90aa6196321820740e2969ae64e9cb (diff) | |
Merge tag 'mlx5-updates-2021-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2021-04-13
mlx5 core and netdev driver updates
1) E-Switch updates from Parav,
1.1) Devlink parameter to control mlx5 metadata enablement for E-Switch
1.2) Trivial cleanups for E-Switch code
1.3) Dynamically allocate vport steering namespaces only when required
2) From Jianbo, Use variably sized data structures for Software steering
3) Several minor cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx5/eswitch.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h index 429a710c5a99..9cf1da2883c6 100644 --- a/include/linux/mlx5/eswitch.h +++ b/include/linux/mlx5/eswitch.h @@ -152,8 +152,7 @@ mlx5_eswitch_vport_match_metadata_enabled(const struct mlx5_eswitch *esw) }; static inline u32 -mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, - int vport_num) +mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, u16 vport_num) { return 0; }; |