From patchwork Thu Mar 11 22:37:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 397570 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp700550jai; Thu, 11 Mar 2021 14:38:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo4tmauBuLNLbJKtaeUNVjhDNs2Ck1vHIR6fmflG5NTy84s8rZLdiSOqoSnlQEOskm11hs X-Received: by 2002:a17:907:94c3:: with SMTP id dn3mr5374584ejc.280.1615502304480; Thu, 11 Mar 2021 14:38:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615502304; cv=none; d=google.com; s=arc-20160816; b=CZEr9DLaggiswuDw+Yq0iFZIDlV00vynvvY7ETmwBkEkD+Pt3VTFJKiIpvfMtJxpeJ rdSVm6cXTEWG2Nnd/W5gT+syN/ZV+qZzE/K9xsL04AXTWyZhmfFIw7NVtvEsnhTwqn1/ hO+bGKf0EB7Il43xLc8/ELEgQ9m2P9jviu/QiKebzrT9fdt7+5gmU1Q/weyIAQmgMK0T brP2s3k7lWPNnyEtwCO2ENvdt6c7opb4ee+cbpPKP2o/bAWDy4SnvEaY7WXFAoJK1WdM 86Uvgm1v0z+dL12K/NSOsGJbVjnUiWhYOUJU7sFemwlGyG2CEnwGX4ZkdnIbyJh/u2t4 5d3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BoQTkkFe5td3+3Diz+RBSX562WOlWyjmtnbQmPZd0cs=; b=l0Lc9OZ4H826fm6dbnzMfXmll7y51NIPMryVJlB+WAzOy1NEHDG6FLyxTEqc9LRw+Q 9Ochw8EMP9W0xou/vUg7ixyOFOgW1cE/eSg2/FBLAXDQ+RyOebVngrfCMG/worPbe0iP aqZ/zBcMbpe0FTaPSP+hrhJwf91z04FEwgju1C6JOP3RIEWylQfWqyw2XrecPcVT0y49 c6hbE46S6tbieYdYrtm5UPKKWFRRS8P9VP4AdUWR/AEkDoRFZAX2RzgOaBdC1eFe1dGg E4l/R+H539hSGJfRZtv/8ZgxM+WDUYGJHFulk36iiE0yIKqT784MvoK+h3H2jX77V3CM J/xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KxrfpHBA; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c12si2615152edx.585.2021.03.11.14.38.24; Thu, 11 Mar 2021 14:38:24 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KxrfpHBA; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231229AbhCKWhx (ORCPT + 8 others); Thu, 11 Mar 2021 17:37:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:33502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229803AbhCKWhi (ORCPT ); Thu, 11 Mar 2021 17:37:38 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 916FF64F26; Thu, 11 Mar 2021 22:37:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615502258; bh=ylhIgTxDxvkxmHKvCFK4z0+i+ivTtNz4xQnZLqpnQvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KxrfpHBAhUVIjfnlaTWV0mGS2AsuwFsfJ0HzpQ32C3vCj6MJV5JbV4K+e59WSbiKG 4ANkfQKoWe8jPXqVvrKvvY06N4cwIGA4FiEnEuXlP+gEuT79aH4Qd6PJkUOiaRwa7Z spY8KFegMwevRJFwvGrEK8vLm6Xab+n8oYhVPpqs+YpX+IJt3N6W8ia6prNgE0F6/W xgL+6zgloIwTy6uL9FeYf0gUQyD8hA5l9vMq/g9FAwKy/jbt9u4XdVUrczdbwcQ9pD OOhiDGInrrsnRf1P5eZf+1tlvJ7yLlgWlHNxaOHzFPstpyEYJ2opPhnXSH3tb22udH yU11NWeAmzuRQ== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Arnd Bergmann , Vlad Buslov , Saeed Mahameed Subject: [net-next 08/15] net/mlx5e: fix mlx5e_tc_tun_update_header_ipv6 dummy definition Date: Thu, 11 Mar 2021 14:37:16 -0800 Message-Id: <20210311223723.361301-9-saeed@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311223723.361301-1-saeed@kernel.org> References: <20210311223723.361301-1-saeed@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Signed-off-by: Arnd Bergmann Reviewed-by: Vlad Buslov Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.29.2 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,