From patchwork Tue Feb 2 13:55:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 375014 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=-19.4 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, USER_AGENT_GIT 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 50A02C43381 for ; Tue, 2 Feb 2021 14:39:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2952464DD5 for ; Tue, 2 Feb 2021 14:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234687AbhBBOiU (ORCPT ); Tue, 2 Feb 2021 09:38:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:51486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbhBBORu (ORCPT ); Tue, 2 Feb 2021 09:17:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 77DB264FCE; Tue, 2 Feb 2021 13:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612274163; bh=zu3Gt86SXPGyJWhY6nCI9luwiVCzfhk0z+r+Ls5Rfsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eBcIfldF414TuIyses6UVoMzupyh9IaC8jGkXzEkvrIw6yjqvDx9iLphF60SKQIRm lKKxzJkgwuvIPZGq5oNzAPHmF9r87EVhenxbMmUE5SnQMujkPrdL71l6KZDJ7/hFSg SW8oDI8/Y4ck4lGfXsx6r2pEW9ZKdXmTLk8FdMIdj8mC4E17RunuRENEACZiDd5LXo i2b6MqkLDeBUw3SmWi1lYiCHpJaUY4Df6c/uFYWfTRFhR6oE+MGoYR/+Jpqh7FO6IK B1aVroWkbFqbzQi89Kf94TxN1Lq2CdgNFNOAF7IvipR5XlYH8iNvSoXTN2TKgR23m+ BcNc+r+KE5Z4w== From: Leon Romanovsky To: Jakub Kicinski , "David S. Miller" , Pablo Neira Ayuso Cc: Leon Romanovsky , coreteam@netfilter.org, Eric Dumazet , Florian Westphal , Hideaki YOSHIFUJI , Jozsef Kadlecsik , Julian Anastasov , linux-kernel@vger.kernel.org, lvs-devel@vger.kernel.org, Matteo Croce , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Simon Horman Subject: [PATCH net 3/4] net/core: move ipv6 gro function declarations to net/ipv6 Date: Tue, 2 Feb 2021 15:55:43 +0200 Message-Id: <20210202135544.3262383-4-leon@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210202135544.3262383-1-leon@kernel.org> References: <20210202135544.3262383-1-leon@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky Fir the following compilation warnings: 1031 | INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, | ^~~~~~~~~~~~~~~~ net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) | ^~~~~~~~~~~~~~~~~ net/ipv6/ip6_offload.c:182:41: warning: no previous prototype for ‘ipv6_gro_receive’ [-Wmissing-prototypes] 182 | INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, | ^~~~~~~~~~~~~~~~ net/ipv6/ip6_offload.c:320:29: warning: no previous prototype for ‘ipv6_gro_complete’ [-Wmissing-prototypes] 320 | INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) Fixes: aaa5d90b395a ("net: use indirect call wrappers at GRO network layer") Signed-off-by: Leon Romanovsky --- include/net/ipv6.h | 3 +++ net/core/dev.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/include/net/ipv6.h b/include/net/ipv6.h index bd1f396cc9c7..68676e6bd4b1 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1265,4 +1265,7 @@ static inline void ip6_sock_set_recvpktinfo(struct sock *sk) release_sock(sk); } +INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, + struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); #endif /* _NET_IPV6_H */ diff --git a/net/core/dev.c b/net/core/dev.c index c360bb5367e2..9a3d8768524b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -101,6 +101,7 @@ #include #include #include +#include #include #include #include @@ -5743,7 +5744,6 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb) } INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int)); -INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int)); static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb) { struct packet_offload *ptype; @@ -5914,8 +5914,6 @@ static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) INDIRECT_CALLABLE_DECLARE(struct sk_buff *inet_gro_receive(struct list_head *, struct sk_buff *)); -INDIRECT_CALLABLE_DECLARE(struct sk_buff *ipv6_gro_receive(struct list_head *, - struct sk_buff *)); static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) { u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);