diff options
| author | Vincent Bernat <vincent@bernat.im> | 2014-09-05 09:09:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-09 14:27:09 -0400 |
| commit | 49a601589caaf0e93194c0cc9b4ecddbe75dd2d5 (patch) | |
| tree | cb4486c3522885f9b6bb61f10960e3b7b27a5b4f /include | |
| parent | afddacc3ccd048c49c7f4f0ad0b6a40730c74715 (diff) | |
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 'include')
| -rw-r--r-- | include/net/ip.h | 2 | ||||
| -rw-r--r-- | include/net/netns/ipv4.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index c8fd6112bd0b..14bfc8e1bcf9 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -229,8 +229,6 @@ static inline int inet_is_local_reserved_port(struct net *net, int port) | |||
| 229 | } | 229 | } |
| 230 | #endif | 230 | #endif |
| 231 | 231 | ||
| 232 | extern int sysctl_ip_nonlocal_bind; | ||
| 233 | |||
| 234 | /* From inetpeer.c */ | 232 | /* From inetpeer.c */ |
| 235 | extern int inet_peer_threshold; | 233 | extern int inet_peer_threshold; |
| 236 | extern int inet_peer_minttl; | 234 | extern int inet_peer_minttl; |
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index aec5e12f9f19..24945cefc4fd 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h | |||
| @@ -76,6 +76,7 @@ struct netns_ipv4 { | |||
| 76 | int sysctl_tcp_ecn; | 76 | int sysctl_tcp_ecn; |
| 77 | int sysctl_ip_no_pmtu_disc; | 77 | int sysctl_ip_no_pmtu_disc; |
| 78 | int sysctl_ip_fwd_use_pmtu; | 78 | int sysctl_ip_fwd_use_pmtu; |
| 79 | int sysctl_ip_nonlocal_bind; | ||
| 79 | 80 | ||
| 80 | int sysctl_fwmark_reflect; | 81 | int sysctl_fwmark_reflect; |
| 81 | int sysctl_tcp_fwmark_accept; | 82 | int sysctl_tcp_fwmark_accept; |