summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-05-14 00:59:19 +0200
committerDavid S. Miller <davem@davemloft.net>2011-05-15 07:22:21 +0200
commit1b1cb1f78a5e9d54c13e176020c3e8ded5d081ce (patch)
treebc29b3c20433a678af2868aa5a49a56b8b9468dc
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher... (diff)
downloadlinux-1b1cb1f78a5e9d54c13e176020c3e8ded5d081ce.tar.xz
linux-1b1cb1f78a5e9d54c13e176020c3e8ded5d081ce.zip
net: ping: small changes
ping_table is not __read_mostly, since it contains one rwlock, and is static to ping.c ping_port_rover & ping_v4_lookup are static Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Vasiliy Kulikov <segoon@openwall.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ping.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index a77e2d788dac..7041d09ae5d5 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -49,9 +49,9 @@
#include <net/checksum.h>
-struct ping_table ping_table __read_mostly;
+static struct ping_table ping_table;
-u16 ping_port_rover;
+static u16 ping_port_rover;
static inline int ping_hashfn(struct net *net, unsigned num, unsigned mask)
{
@@ -150,8 +150,8 @@ static void ping_v4_unhash(struct sock *sk)
}
}
-struct sock *ping_v4_lookup(struct net *net, u32 saddr, u32 daddr,
- u16 ident, int dif)
+static struct sock *ping_v4_lookup(struct net *net, u32 saddr, u32 daddr,
+ u16 ident, int dif)
{
struct hlist_nulls_head *hslot = ping_hashslot(&ping_table, net, ident);
struct sock *sk = NULL;