| Message ID | 20220518183022.2034373-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net-next] net/mlx5: fix multiple definitions of mlx5_lag_mpesw_init / mlx5_lag_mpesw_cleanup | expand |
On 18 May 11:30, Jakub Kicinski wrote: >static inline is needed in the header. > >Fixes: 94db33177819 ("net/mlx5: Support multiport eswitch mode") >Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Saeed Mahameed <saeedm@nvidia.com> Sorry! Go ahead and apply this.
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 18 May 2022 11:30:22 -0700 you wrote: > static inline is needed in the header. > > Fixes: 94db33177819 ("net/mlx5: Support multiport eswitch mode") > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: saeedm@nvidia.com > CC: leon@kernel.org > CC: elic@nvidia.com > CC: mbloch@nvidia.com > CC: linux-rdma@vger.kernel.org > > [...] Here is the summary with links: - [net-next] net/mlx5: fix multiple definitions of mlx5_lag_mpesw_init / mlx5_lag_mpesw_cleanup https://git.kernel.org/netdev/net-next/c/d935053a62fa You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h index d39a02280e29..be4abcb8fcd5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h @@ -19,8 +19,8 @@ bool mlx5_lag_mpesw_is_activated(struct mlx5_core_dev *dev); void mlx5_lag_mpesw_init(struct mlx5_lag *ldev); void mlx5_lag_mpesw_cleanup(struct mlx5_lag *ldev); #else -void mlx5_lag_mpesw_init(struct mlx5_lag *ldev) {} -void mlx5_lag_mpesw_cleanup(struct mlx5_lag *ldev) {} +static inline void mlx5_lag_mpesw_init(struct mlx5_lag *ldev) {} +static inline void mlx5_lag_mpesw_cleanup(struct mlx5_lag *ldev) {} #endif #endif /* __MLX5_LAG_MPESW_H__ */
static inline is needed in the header. Fixes: 94db33177819 ("net/mlx5: Support multiport eswitch mode") Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: saeedm@nvidia.com CC: leon@kernel.org CC: elic@nvidia.com CC: mbloch@nvidia.com CC: linux-rdma@vger.kernel.org --- drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)