diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-12-13 23:13:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-18 16:58:20 -0500 |
commit | 974eda11c54290a1be8f8b155edae7d791e5ce57 (patch) | |
tree | e8956b7e45c8f2e033567d788757e086f76230a0 /net/ipv4/xfrm4_state.c | |
parent | 143c9054949436cb05e468439dc5e46231f33d09 (diff) |
inet: make no_pmtu_disc per namespace and kill ipv4_config
The other field in ipv4_config, log_martians, was converted to a
per-interface setting, so we can just remove the whole structure.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
-rw-r--r-- | net/ipv4/xfrm4_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 0b2a0641526a..542074c00c78 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | static int xfrm4_init_flags(struct xfrm_state *x) | 17 | static int xfrm4_init_flags(struct xfrm_state *x) |
18 | { | 18 | { |
19 | if (ipv4_config.no_pmtu_disc) | 19 | if (xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc) |
20 | x->props.flags |= XFRM_STATE_NOPMTUDISC; | 20 | x->props.flags |= XFRM_STATE_NOPMTUDISC; |
21 | return 0; | 21 | return 0; |
22 | } | 22 | } |