diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-07-20 01:35:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-20 01:35:03 -0400 |
commit | 53b7997fd5c62408d10b9aafb38974ce90fd2356 (patch) | |
tree | bc23e6ec248a6d999cdc779abdfdc843c5640197 /net/ipv6/route.c | |
parent | 721499e8931c5732202481ae24f2dfbf9910f129 (diff) |
ipv6 netns: Make several "global" sysctl variables namespace aware.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index cb8a51271b67..615b328de251 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -676,7 +676,7 @@ static struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, | |||
676 | int strict = 0; | 676 | int strict = 0; |
677 | int attempts = 3; | 677 | int attempts = 3; |
678 | int err; | 678 | int err; |
679 | int reachable = ipv6_devconf.forwarding ? 0 : RT6_LOOKUP_F_REACHABLE; | 679 | int reachable = net->ipv6.devconf_all->forwarding ? 0 : RT6_LOOKUP_F_REACHABLE; |
680 | 680 | ||
681 | strict |= flags & RT6_LOOKUP_F_IFACE; | 681 | strict |= flags & RT6_LOOKUP_F_IFACE; |
682 | 682 | ||
@@ -1058,7 +1058,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst) | |||
1058 | hoplimit = idev->cnf.hop_limit; | 1058 | hoplimit = idev->cnf.hop_limit; |
1059 | in6_dev_put(idev); | 1059 | in6_dev_put(idev); |
1060 | } else | 1060 | } else |
1061 | hoplimit = ipv6_devconf.hop_limit; | 1061 | hoplimit = dev_net(dev)->ipv6.devconf_all->hop_limit; |
1062 | } | 1062 | } |
1063 | return hoplimit; | 1063 | return hoplimit; |
1064 | } | 1064 | } |