diff mbox

[net-next] ipv4: ping make local stuff static

Message ID 20131228111142.6fcc0234@nehalam.linuxnetplumber.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Hemminger Dec. 28, 2013, 7:11 p.m. UTC 
Don't export ping_table or ping_v4_sendmsg. Both are only used
inside ping code.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

---
 include/net/ping.h |    8 --------
 net/ipv4/ping.c    |   10 +++++++---
 2 files changed, 7 insertions(+), 11 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Dec. 28, 2013, 10:06 p.m. UTC | #1 
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sat, 28 Dec 2013 11:11:42 -0800

> Don't export ping_table or ping_v4_sendmsg. Both are only used
> inside ping code.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

ping_v4_sendmsg was meant to be used by ping_v6_sendmsg in order to
support ipv4 mapped ipv6 addresses, currently it just returns
-EINVAL.

But yeah, that never happened.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- a/include/net/ping.h	2013-12-24 15:15:26.753741401 -0800
+++ b/include/net/ping.h	2013-12-24 15:15:59.905295851 -0800
@@ -42,11 +42,6 @@  struct pingv6_ops {
 			     const struct net_device *dev, int strict);
 };
 
-struct ping_table {
-	struct hlist_nulls_head	hash[PING_HTABLE_SIZE];
-	rwlock_t		lock;
-};
-
 struct ping_iter_state {
 	struct seq_net_private  p;
 	int			bucket;
@@ -54,7 +49,6 @@  struct ping_iter_state {
 };
 
 extern struct proto ping_prot;
-extern struct ping_table ping_table;
 #if IS_ENABLED(CONFIG_IPV6)
 extern struct pingv6_ops pingv6_ops;
 #endif
@@ -81,8 +75,6 @@  int  ping_recvmsg(struct kiocb *iocb, st
 		  size_t len, int noblock, int flags, int *addr_len);
 int  ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
 			 void *user_icmph, size_t icmph_len);
-int  ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-		     size_t len);
 int  ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 		     size_t len);
 int  ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
--- a/net/ipv4/ping.c	2013-12-24 15:15:26.753741401 -0800
+++ b/net/ipv4/ping.c	2013-12-24 15:15:59.905295851 -0800
@@ -53,8 +53,12 @@ 
 #include <net/transp_v6.h>
 #endif
 
+struct ping_table {
+	struct hlist_nulls_head	hash[PING_HTABLE_SIZE];
+	rwlock_t		lock;
+};
 
-struct ping_table ping_table;
+static struct ping_table ping_table;
 struct pingv6_ops pingv6_ops;
 EXPORT_SYMBOL_GPL(pingv6_ops);
 
@@ -668,8 +672,8 @@  int ping_common_sendmsg(int family, stru
 }
 EXPORT_SYMBOL_GPL(ping_common_sendmsg);
 
-int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-		    size_t len)
+static int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+			   size_t len)
 {
 	struct net *net = sock_net(sk);
 	struct flowi4 fl4;