ping: move ping_group_range out of CONFIG_SYSCTL
Similarly, when CONFIG_SYSCTL is not set, ping_group_range should still work, just that no one can change it. Therefore we should move it out of sysctl_net_ipv4.c. And, it should not share the same seqlock with ip_local_port_range. BTW, rename it to ->ping_group_range 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>
This commit is contained in:

committed by
David S. Miller

parent
c9d8f1a642
commit
ba6b918ab2
@@ -20,6 +20,11 @@ struct local_ports {
|
||||
int range[2];
|
||||
};
|
||||
|
||||
struct ping_group_range {
|
||||
seqlock_t lock;
|
||||
kgid_t range[2];
|
||||
};
|
||||
|
||||
struct netns_ipv4 {
|
||||
#ifdef CONFIG_SYSCTL
|
||||
struct ctl_table_header *forw_hdr;
|
||||
@@ -72,7 +77,7 @@ struct netns_ipv4 {
|
||||
int sysctl_ip_no_pmtu_disc;
|
||||
int sysctl_ip_fwd_use_pmtu;
|
||||
|
||||
kgid_t sysctl_ping_group_range[2];
|
||||
struct ping_group_range ping_group_range;
|
||||
|
||||
atomic_t dev_addr_genid;
|
||||
|
||||
|
Reference in New Issue
Block a user