From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leon Romanovsky Subject: [PATCH net 2/4] ipv6: move udp declarations to net/udp.h Date: Tue, 2 Feb 2021 15:55:42 +0200 Message-ID: <20210202135544.3262383-3-leon@kernel.org> References: <20210202135544.3262383-1-leon@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612274156; bh=DR0Ao7cYzAFwiQZi+Sf24cz1CDI9PHhlVdfFgDadyMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QlcB7nd4RJe57D3/ViU+Q+KQbLURKQKpBZsn7jgpVKIgMv2prrmmdqfKm2pEonFv3 PuXfa/TBYbqB1pVYfj1h+o17M1UxS2U8jvkMNdfYHrvNFYlY0JBrdXiIx5/++tq39I Pk9rn1X0SfZUIrnYl/PArrVQR/6ITsoHxSK0z6EH+t4m5ceeSApG46QYfryT0rLPKo 08sR2h8/LWZacRA/KbS0Gnhojjy7ZpWCwgPov8xsmcUUbAGjnP0jPbIIOvHG+jxJsm s02UNd9nSYDcD0nfv19UqvbDP2uGhU+cTZGyj0sMDtDkitroGXGQApYZ6mGeviUkKp 59IXCB/MIr3rg== In-Reply-To: <20210202135544.3262383-1-leon@kernel.org> List-ID: Content-Type: text/plain; charset="us-ascii" 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 From: Leon Romanovsky Fix the following compilation warning: net/ipv6/udp.c:1031:30: warning: no previous prototype for 'udp_v6_early_demux' [-Wmissing-prototypes] 1031 | INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) | ^~~~~~~~~~~~~~~~~~ net/ipv6/udp.c:1072:29: warning: no previous prototype for 'udpv6_rcv' [-Wmissing-prototypes] 1072 | INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb) | ^~~~~~~~~ Fixes: 97ff7ffb11fe ("net: use indirect calls helpers at early demux stage") Signed-off-by: Leon Romanovsky --- include/net/udp.h | 3 +++ net/ipv6/ip6_input.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/net/udp.h b/include/net/udp.h index 877832bed471..ff2de866bca4 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -173,6 +173,9 @@ INDIRECT_CALLABLE_DECLARE(int udp4_gro_complete(struct sk_buff *, int)); INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp6_gro_receive(struct list_head *, struct sk_buff *)); INDIRECT_CALLABLE_DECLARE(int udp6_gro_complete(struct sk_buff *, int)); +INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int udpv6_rcv(struct sk_buff *)); + struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb, struct udphdr *uh, struct sock *sk); int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup); diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index e96304d8a4a7..e9d2a4a409aa 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -44,7 +45,6 @@ #include #include -INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *)); INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *)); static void ip6_rcv_finish_core(struct net *net, struct sock *sk, struct sk_buff *skb) @@ -352,7 +352,6 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt, ip6_sublist_rcv(&sublist, curr_dev, curr_net); } -INDIRECT_CALLABLE_DECLARE(int udpv6_rcv(struct sk_buff *)); INDIRECT_CALLABLE_DECLARE(int tcp_v6_rcv(struct sk_buff *)); /* -- 2.29.2