ipv4: ping make local stuff static
Subsystems (2)
PATCH 1/1 ipv4: ping make local stuff static
Don't export ping_table or ping_v4_sendmsg. Both are only used inside ping code.
Signed-off-by Stephen Hemminger <[email protected]>
--- include/net/ping.h | 8 -------- net/ipv4/ping.c | 10 +++++++--- 2 files changed, 7 insertions(+), 11 deletions(-)
include/net/ping.h +0 -8
@@ -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);
net/ipv4/ping.c +7 -3
@@ -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;
From: Stephen Hemminger <[email protected]>
Date: Sat, 28 Dec 2013 11:11:42 -0800
Quoted 4 lines
Don't export
ping_tableorping_v4_sendmsg. Both are only used inside ping code.Signed-off-by Stephen Hemminger <[email protected]>
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.