From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0ED6C28CFB for ; Tue, 2 Mar 2021 09:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82A1464F04 for ; Tue, 2 Mar 2021 09:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382125AbhCBI4D (ORCPT ); Tue, 2 Mar 2021 03:56:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:44304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1835969AbhCBGb0 (ORCPT ); Tue, 2 Mar 2021 01:31:26 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C76116186A; Tue, 2 Mar 2021 06:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614666645; bh=EPbOnkQQcY42gIMqCP33MRMRht0g1yyJCnfNd6DURw0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Vknkfdwry8Rf7wq+QHyVs59vzLyLPBJ3FNX9in5VQTfCb3VM/6nFmjzbdDSvWMTkh oYO94LgUveAu359jlk/l+Zr/jV8lnufS7eqHP34PR4DS+7YSvFFNlOHBXlgd/lxvxz 2kwCJNBLbhOWqVn6t0w6sMS3uh4YPGKDt4LKhrT4VJdsyePQ/mb3xj2PpU0taGvs0j +S9i4V11E1Tvz7lsG6gGrHcRUCAIREE3zpR9eLrlWR+FqjMldQMGe71Hgw5p7Qxu5t I8QLopPfyQBmzcP7sWtiZuNZQGi4K9/bMb+Bu3K1vzwK0MNzNpiySL+gQv7rv4tPnG wRaAowKyT6OCA== Message-ID: Subject: Re: [PATCH] net/mlx5e: fix mlx5e_tc_tun_update_header_ipv6 dummy definition From: Saeed Mahameed To: Vlad Buslov , Arnd Bergmann Cc: Leon Romanovsky , "David S. Miller" , Jakub Kicinski , Dmytro Linkin , Roi Dayan , Arnd Bergmann , Eli Britstein , Eli Cohen , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 01 Mar 2021 22:30:43 -0800 In-Reply-To: References: <20210225125501.1792072-1-arnd@kernel.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 2021-03-01 at 11:57 +0200, Vlad Buslov wrote: > On Thu 25 Feb 2021 at 14:54, Arnd Bergmann wrote: > > From: Arnd Bergmann > > > > The alternative implementation of this function in a header file > > is declared as a global symbol, and gets added to every .c file > > that includes it, which leads to a link error: > > > > arm-linux-gnueabi-ld: > > drivers/net/ethernet/mellanox/mlx5/core/en_rx.o: in function > > `mlx5e_tc_tun_update_header_ipv6': > > en_rx.c:(.text+0x0): multiple definition of > > `mlx5e_tc_tun_update_header_ipv6'; > > drivers/net/ethernet/mellanox/mlx5/core/en_main.o:en_main.c:(.text+ > > 0x0): first defined here > > > > Mark it 'static inline' like the other functions here. > > > > Fixes: c7b9038d8af6 ("net/mlx5e: TC preparation refactoring for > > routing update event") > > Signed-off-by: Arnd Bergmann > > --- > >  drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 10 ++++++--- > > - > >  1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h > > b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h > > index 67de2bf36861..89d5ca91566e 100644 > > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h > > @@ -76,10 +76,12 @@ int mlx5e_tc_tun_update_header_ipv6(struct > > mlx5e_priv *priv, > >  static inline int > >  mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, > >                                 struct net_device *mirred_dev, > > -                               struct mlx5e_encap_entry *e) { > > return -EOPNOTSUPP; } > > -int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, > > -                                   struct net_device *mirred_dev, > > -                                   struct mlx5e_encap_entry *e) > > +                               struct mlx5e_encap_entry *e) > > +{ return -EOPNOTSUPP; } > > +static inline int > > +mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, > > +                               struct net_device *mirred_dev, > > +                               struct mlx5e_encap_entry *e) > >  { return -EOPNOTSUPP; } > >  #endif > >  int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv, > > Thanks Arnd! > > Reviewed-by: Vlad Buslov Applied to net-mlx5, Thanks.