From patchwork Wed May 18 18:30:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12853961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD5BC433FE for ; Wed, 18 May 2022 18:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241427AbiERSaf (ORCPT ); Wed, 18 May 2022 14:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241422AbiERSae (ORCPT ); Wed, 18 May 2022 14:30:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D41322268A2; Wed, 18 May 2022 11:30:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E4E836188A; Wed, 18 May 2022 18:30:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE951C34100; Wed, 18 May 2022 18:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652898631; bh=QoG7IaVCnM3Dd14OvQDZrEZ69vO2NwP3iRox95LMaV4=; h=From:To:Cc:Subject:Date:From; b=iIbm72hrJaZkK0ywbpe/4kIU2z3KRyycpen6SeVXgwX6P93Jt8qaTXdi9iC3BpIOs XEGKdkC1R40iSigNmD1lKIezTa8WEqFbYH5Y1yHM0Hrrur0LqRCYGArMTdBUPQrHKG D399g6vDsjE1sA1p6neZ8eOYDSHvm4z//UqIKQzs5eUVyJpFETvMv8ZNh5iVoZMtLl 47iTXMEPTCtG1JE74UXHeH3foDQq4haJDwp2vAr8aYAei27mCH/aRV3JYVulK+0vyq yK+BZ7NnMBU1yDWJN7iOmNha3HMnPePesc0E4gzZjZOc6A9ZHm4G50x87dpcio6jnD YMNT8+XhD73Qw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, Jakub Kicinski , saeedm@nvidia.com, leon@kernel.org, elic@nvidia.com, mbloch@nvidia.com, linux-rdma@vger.kernel.org Subject: [PATCH net-next] net/mlx5: fix multiple definitions of mlx5_lag_mpesw_init / mlx5_lag_mpesw_cleanup Date: Wed, 18 May 2022 11:30:22 -0700 Message-Id: <20220518183022.2034373-1-kuba@kernel.org> X-Mailer: git-send-email 2.34.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org static inline is needed in the header. Fixes: 94db33177819 ("net/mlx5: Support multiport eswitch mode") Signed-off-by: Jakub Kicinski Acked-by: Saeed Mahameed --- 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(-) 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__ */