diff options
author | 2016-01-07 16:38:45 +0200 | |
---|---|---|
committer | 2016-01-10 17:32:09 -0500 | |
commit | b840d15d39128d08ed4486085e5507d2617b9ae1 (patch) | |
tree | 33189ee2067bbb204c886affcbca9ac764621f94 /net/ipv4/sysctl_net_ipv4.c | |
parent | ipv4: Namespecify tcp_keepalive_probes sysctl knob (diff) | |
download | linux-b840d15d39128d08ed4486085e5507d2617b9ae1.tar.gz linux-b840d15d39128d08ed4486085e5507d2617b9ae1.tar.bz2 linux-b840d15d39128d08ed4486085e5507d2617b9ae1.zip |
ipv4: Namespecify the tcp_keepalive_intvl sysctl knob
This is the final part required to namespaceify the tcp
keep alive mechanism.
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index e99fbb77dba7..46ce410703b1 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -337,13 +337,6 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec }, { - .procname = "tcp_keepalive_intvl", - .data = &sysctl_tcp_keepalive_intvl, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { .procname = "tcp_retries1", .data = &sysctl_tcp_retries1, .maxlen = sizeof(int), @@ -961,6 +954,13 @@ static struct ctl_table ipv4_net_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, + { + .procname = "tcp_keepalive_intvl", + .data = &init_net.ipv4.sysctl_tcp_keepalive_intvl, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_jiffies, + }, { } }; |