diff options
| author | Vincent Bernat <vincent@bernat.im> | 2014-09-05 15:09:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-09 11:27:09 -0700 |
| commit | 49a601589caaf0e93194c0cc9b4ecddbe75dd2d5 (patch) | |
| tree | cb4486c3522885f9b6bb61f10960e3b7b27a5b4f /net/ipv4/sysctl_net_ipv4.c | |
| parent | afddacc3ccd048c49c7f4f0ad0b6a40730c74715 (diff) | |
| download | linux-stable-49a601589caaf0e93194c0cc9b4ecddbe75dd2d5.tar.gz linux-stable-49a601589caaf0e93194c0cc9b4ecddbe75dd2d5.tar.bz2 linux-stable-49a601589caaf0e93194c0cc9b4ecddbe75dd2d5.zip | |
net/ipv4: bind ip_nonlocal_bind to current netns
net.ipv4.ip_nonlocal_bind sysctl was global to all network
namespaces. This patch allows to set a different value for each
network namespace.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
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 45d156dacd61..1599966f4639 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -286,13 +286,6 @@ static struct ctl_table ipv4_table[] = { .extra2 = &ip_ttl_max, }, { - .procname = "ip_nonlocal_bind", - .data = &sysctl_ip_nonlocal_bind, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec - }, - { .procname = "tcp_syn_retries", .data = &sysctl_tcp_syn_retries, .maxlen = sizeof(int), @@ -849,6 +842,13 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dointvec, }, { + .procname = "ip_nonlocal_bind", + .data = &init_net.ipv4.sysctl_ip_nonlocal_bind, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, + { .procname = "fwmark_reflect", .data = &init_net.ipv4.sysctl_fwmark_reflect, .maxlen = sizeof(int), |