summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ping.c
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2014-05-06 11:02:49 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-08 22:50:47 -0400
commitc9d8f1a64225dfcc2f721d73a5984a2444920744 (patch)
tree504650428b82655ca53cc521b854a9b895fc744a /net/ipv4/ping.c
parent23a456f05353035d1a2b3f1b9a92707acdc036e0 (diff)
downloadlinux-stable-c9d8f1a64225dfcc2f721d73a5984a2444920744.tar.gz
linux-stable-c9d8f1a64225dfcc2f721d73a5984a2444920744.tar.bz2
linux-stable-c9d8f1a64225dfcc2f721d73a5984a2444920744.zip
ipv4: move local_port_range out of CONFIG_SYSCTL
When CONFIG_SYSCTL is not set, ip_local_port_range should still work, just that no one can change it. Therefore we should move it out of sysctl_inet.c. Also, rename it to ->ip_local_ports instead. Cc: David S. Miller <davem@davemloft.net> Cc: Francois Romieu <romieu@fr.zoreil.com> Reported-by: Stefan de Konink <stefan@konink.de> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ping.c')
-rw-r--r--net/ipv4/ping.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 8210964a9f19..347bdde9a585 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -240,11 +240,11 @@ static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,
unsigned int seq;
do {
- seq = read_seqbegin(&net->ipv4.sysctl_local_ports.lock);
+ seq = read_seqbegin(&net->ipv4.ip_local_ports.lock);
*low = data[0];
*high = data[1];
- } while (read_seqretry(&net->ipv4.sysctl_local_ports.lock, seq));
+ } while (read_seqretry(&net->ipv4.ip_local_ports.lock, seq));
}