diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-11-17 10:50:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-17 10:50:53 +0000 |
| commit | 9311ccef2782488ab58676c8282f9f71d01cebf5 (patch) | |
| tree | 74458341e96673eb6ba03cadc17e2c49f678d56d /include/linux | |
| parent | net: stmmac: Fix signed/unsigned wreckage (diff) | |
| parent | net/mlx5: E-Switch, return error if encap isn't supported (diff) | |
| download | linux-dev-9311ccef2782488ab58676c8282f9f71d01cebf5.tar.xz linux-dev-9311ccef2782488ab58676c8282f9f71d01cebf5.zip | |
Merge tag 'mlx5-fixes-2021-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-fixes-2021-11-16
Please pull this mlx5 fixes series, or let me know in case of any problem.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/eswitch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h index 97afcea39a7b..8b18fe9771f9 100644 --- a/include/linux/mlx5/eswitch.h +++ b/include/linux/mlx5/eswitch.h @@ -145,13 +145,13 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw, GENMASK(31 - ESW_TUN_ID_BITS - ESW_RESERVED_BITS, \ ESW_TUN_OPTS_OFFSET + 1) -u8 mlx5_eswitch_mode(struct mlx5_core_dev *dev); +u8 mlx5_eswitch_mode(const struct mlx5_core_dev *dev); u16 mlx5_eswitch_get_total_vports(const struct mlx5_core_dev *dev); struct mlx5_core_dev *mlx5_eswitch_get_core_dev(struct mlx5_eswitch *esw); #else /* CONFIG_MLX5_ESWITCH */ -static inline u8 mlx5_eswitch_mode(struct mlx5_core_dev *dev) +static inline u8 mlx5_eswitch_mode(const struct mlx5_core_dev *dev) { return MLX5_ESWITCH_NONE; } |