Browse Source

udp: make *udp*_queue_rcv_skb() functions static

Since the udp memory accounting refactor, we don't need any more
to export the *udp*_queue_rcv_skb(). Make them static and fix
a couple of sparse warnings:

net/ipv4/udp.c:1615:5: warning: symbol 'udp_queue_rcv_skb' was not
declared. Should it be static?
net/ipv6/udp.c:572:5: warning: symbol 'udpv6_queue_rcv_skb' was not
declared. Should it be static?

Fixes: 850cbaddb52d ("udp: use it's own memory accounting schema")
Fixes: c915fe13cbaa ("udplite: fix NULL pointer dereference")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Paolo Abeni 8 years ago
parent
commit
a3f96c47c8
4 changed files with 4 additions and 6 deletions
  1. 2 2
      net/ipv4/udp.c
  2. 0 1
      net/ipv4/udp_impl.h
  3. 2 2
      net/ipv6/udp.c
  4. 0 1
      net/ipv6/udp_impl.h

+ 2 - 2
net/ipv4/udp.c

@@ -1612,7 +1612,7 @@ static void udp_v4_rehash(struct sock *sk)
 	udp_lib_rehash(sk, new_hash);
 	udp_lib_rehash(sk, new_hash);
 }
 }
 
 
-int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
 {
 	int rc;
 	int rc;
 
 
@@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(udp_encap_enable);
  * Note that in the success and error cases, the skb is assumed to
  * Note that in the success and error cases, the skb is assumed to
  * have either been requeued or freed.
  * have either been requeued or freed.
  */
  */
-int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
 {
 	struct udp_sock *up = udp_sk(sk);
 	struct udp_sock *up = udp_sk(sk);
 	int is_udplite = IS_UDPLITE(sk);
 	int is_udplite = IS_UDPLITE(sk);

+ 0 - 1
net/ipv4/udp_impl.h

@@ -25,7 +25,6 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
 		int flags, int *addr_len);
 		int flags, int *addr_len);
 int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
 int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
 		 int flags);
 		 int flags);
-int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 void udp_destroy_sock(struct sock *sk);
 void udp_destroy_sock(struct sock *sk);
 
 
 #ifdef CONFIG_PROC_FS
 #ifdef CONFIG_PROC_FS

+ 2 - 2
net/ipv6/udp.c

@@ -526,7 +526,7 @@ out:
 	return;
 	return;
 }
 }
 
 
-int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
 {
 	int rc;
 	int rc;
 
 
@@ -569,7 +569,7 @@ void udpv6_encap_enable(void)
 }
 }
 EXPORT_SYMBOL(udpv6_encap_enable);
 EXPORT_SYMBOL(udpv6_encap_enable);
 
 
-int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
 {
 	struct udp_sock *up = udp_sk(sk);
 	struct udp_sock *up = udp_sk(sk);
 	int is_udplite = IS_UDPLITE(sk);
 	int is_udplite = IS_UDPLITE(sk);

+ 0 - 1
net/ipv6/udp_impl.h

@@ -26,7 +26,6 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
 int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
 int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
 int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
 int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
 		  int flags, int *addr_len);
 		  int flags, int *addr_len);
-int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 void udpv6_destroy_sock(struct sock *sk);
 void udpv6_destroy_sock(struct sock *sk);
 
 
 #ifdef CONFIG_PROC_FS
 #ifdef CONFIG_PROC_FS