Commit 5521d95e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: move tcp gro declarations to net/tcp.h 



This patch removes following (C=1 W=1) warnings for CONFIG_RETPOLINE=y :

net/ipv4/tcp_offload.c:306:16: warning: symbol 'tcp4_gro_receive' was not declared. Should it be static?
net/ipv4/tcp_offload.c:306:17: warning: no previous prototype for 'tcp4_gro_receive' [-Wmissing-prototypes]
net/ipv4/tcp_offload.c:319:29: warning: symbol 'tcp4_gro_complete' was not declared. Should it be static?
net/ipv4/tcp_offload.c:319:29: warning: no previous prototype for 'tcp4_gro_complete' [-Wmissing-prototypes]
  CHECK   net/ipv6/tcpv6_offload.c
net/ipv6/tcpv6_offload.c:16:16: warning: symbol 'tcp6_gro_receive' was not declared. Should it be static?
net/ipv6/tcpv6_offload.c:29:29: warning: symbol 'tcp6_gro_complete' was not declared. Should it be static?
  CC      net/ipv6/tcpv6_offload.o
net/ipv6/tcpv6_offload.c:16:17: warning: no previous prototype for 'tcp6_gro_receive' [-Wmissing-prototypes]
   16 | struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb)
      |                 ^~~~~~~~~~~~~~~~
net/ipv6/tcpv6_offload.c:29:29: warning: no previous prototype for 'tcp6_gro_complete' [-Wmissing-prototypes]
   29 | INDIRECT_CALLABLE_SCOPE int tcp6_gro_complete(struct sk_buff *skb, int thoff)
      |                             ^~~~~~~~~~~~~~~~~

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b9e2f25

include/net/tcp.h

+4 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,10 @@ void tcp_v4_destroy_sock(struct sock *sk); 
struct sk_buff *tcp_gso_segment(struct sk_buff *skb,

				netdev_features_t features);

struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb);

INDIRECT_CALLABLE_DECLARE(int tcp4_gro_complete(struct sk_buff *skb, int thoff));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb));

INDIRECT_CALLABLE_DECLARE(int tcp6_gro_complete(struct sk_buff *skb, int thoff));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb));

int tcp_gro_complete(struct sk_buff *skb);



void __tcp_v4_send_check(struct sk_buff *skb, __be32 saddr, __be32 daddr);

net/ipv4/af_inet.c

+0 −3
Original line number Diff line number Diff line
@@ -1432,8 +1432,6 @@ static struct sk_buff *ipip_gso_segment(struct sk_buff *skb, 
	return inet_gso_segment(skb, features);

}



INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *,

							   struct sk_buff *));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp4_gro_receive(struct list_head *,

							   struct sk_buff *));

struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb)
@@ -1608,7 +1606,6 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len) 
	return -EINVAL;

}



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

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

int inet_gro_complete(struct sk_buff *skb, int nhoff)

{

net/ipv6/ip6_offload.c

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

#include <net/ipv6.h>

#include <net/inet_common.h>

#include <net/tcp.h>



#include "ip6_offload.h"
@@ -177,8 +178,6 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph, 
	return len;

}



INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp6_gro_receive(struct list_head *,

							   struct sk_buff *));

INDIRECT_CALLABLE_DECLARE(struct sk_buff *udp6_gro_receive(struct list_head *,

							   struct sk_buff *));

INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head,
@@ -319,7 +318,6 @@ static struct sk_buff *ip4ip6_gro_receive(struct list_head *head, 
	return inet_gro_receive(head, skb);

}



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

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

INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE