diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-01-10 06:01:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:01:20 -0500 |
commit | 4990509f19e8f1e000a83a88fc46328f73b8a88a (patch) | |
tree | 83d493e6081e9d2298a55925ee0a7f4bfedd0a51 /include | |
parent | 7c76509d0da99f29289b9b7ab134791e45d49b15 (diff) |
[NETNS][IPV6]: Make sysctls route per namespace.
All the sysctl concerning the routes are moved to the network
namespace structure. A helper function is called to initialize the
variables.
Because the ipv6 protocol is not yet per namespace, the variables are
accessed relatively from the network namespace.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/ip6_route.h | 2 | ||||
-rw-r--r-- | include/net/netns/ipv6.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 1a0698b1e86c..faac0eee1ef3 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -43,8 +43,6 @@ extern struct rt6_info ip6_prohibit_entry; | |||
43 | extern struct rt6_info ip6_blk_hole_entry; | 43 | extern struct rt6_info ip6_blk_hole_entry; |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | extern int ip6_rt_gc_interval; | ||
47 | |||
48 | extern void ip6_route_input(struct sk_buff *skb); | 46 | extern void ip6_route_input(struct sk_buff *skb); |
49 | 47 | ||
50 | extern struct dst_entry * ip6_route_output(struct sock *sk, | 48 | extern struct dst_entry * ip6_route_output(struct sock *sk, |
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index ea4a71ac23d4..050d08809ef2 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h | |||
@@ -15,6 +15,14 @@ struct netns_sysctl_ipv6 { | |||
15 | #endif | 15 | #endif |
16 | struct inet_frags_ctl frags; | 16 | struct inet_frags_ctl frags; |
17 | int bindv6only; | 17 | int bindv6only; |
18 | int flush_delay; | ||
19 | int ip6_rt_max_size; | ||
20 | int ip6_rt_gc_min_interval; | ||
21 | int ip6_rt_gc_timeout; | ||
22 | int ip6_rt_gc_interval; | ||
23 | int ip6_rt_gc_elasticity; | ||
24 | int ip6_rt_mtu_expires; | ||
25 | int ip6_rt_min_advmss; | ||
18 | }; | 26 | }; |
19 | 27 | ||
20 | struct netns_ipv6 { | 28 | struct netns_ipv6 { |