Commit c56006f8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fix-w-1-compilation-warnings-in-net-folder' 

Leon Romanovsky says:

====================
Fix W=1 compilation warnings in net/* folder

Changelog:
v2:
 * Patch 3: Added missing include file.
v1: https://lore.kernel.org/lkml/20210203101612.4004322-1-leon@kernel.org
 * Removed Fixes lines.
 * Changed target from net to be net-next.
 * Patch 1: Moved function declaration to be outside config instead
   games with if/endif.
 * Patch 3: Moved declarations to new header file.
v0: https://lore.kernel.org/lkml/20210202135544.3262383-1-leon@kernel.org
====================

Link: https://lore.kernel.org/r/20210203135112.4083711-1-leon@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8f8a42ff edf597da

include/linux/icmpv6.h

+1 −1
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) 


typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info,

			     const struct in6_addr *force_saddr);

#if IS_BUILTIN(CONFIG_IPV6)

void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

		const struct in6_addr *force_saddr);

#if IS_BUILTIN(CONFIG_IPV6)

static inline void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)

{

	icmp6_send(skb, type, code, info, NULL);

include/net/gro.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */



#ifndef _NET_IPV6_GRO_H

#define _NET_IPV6_GRO_H



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));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *inet_gro_receive(struct list_head *,

							   struct sk_buff *));

INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int));

#endif /* _NET_IPV6_GRO_H */

include/net/ip_vs.h

+11 −0
Original line number Diff line number Diff line
@@ -1712,4 +1712,15 @@ ip_vs_dest_conn_overhead(struct ip_vs_dest *dest) 
		atomic_read(&dest->inactconns);

}



#ifdef CONFIG_IP_VS_PROTO_TCP

INDIRECT_CALLABLE_DECLARE(int

	tcp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,

			 struct ip_vs_conn *cp, struct ip_vs_iphdr *iph));

#endif



#ifdef CONFIG_IP_VS_PROTO_UDP

INDIRECT_CALLABLE_DECLARE(int

	udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,

			 struct ip_vs_conn *cp, struct ip_vs_iphdr *iph));

#endif

#endif	/* _NET_IP_VS_H */

include/net/udp.h

+3 −0
Original line number Diff line number Diff line
@@ -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);

net/core/dev.c

+1 −6
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#include <net/dsa.h>

#include <net/dst.h>

#include <net/dst_metadata.h>

#include <net/gro.h>

#include <net/pkt_sched.h>

#include <net/pkt_cls.h>

#include <net/checksum.h>
@@ -5751,8 +5752,6 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb) 
		gro_normal_list(napi);

}



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;
@@ -5921,10 +5920,6 @@ static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) 
	napi_gro_complete(napi, oldest);

}



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);