summaryrefslogtreecommitdiff
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-07-19 22:35:03 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-19 22:35:03 -0700
commit53b7997fd5c62408d10b9aafb38974ce90fd2356 (patch)
treebc23e6ec248a6d999cdc779abdfdc843c5640197 /net/ipv6/route.c
parent721499e8931c5732202481ae24f2dfbf9910f129 (diff)
downloadlinux-3.10-53b7997fd5c62408d10b9aafb38974ce90fd2356.tar.gz
linux-3.10-53b7997fd5c62408d10b9aafb38974ce90fd2356.tar.bz2
linux-3.10-53b7997fd5c62408d10b9aafb38974ce90fd2356.zip
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index cb8a51271b6..615b328de25 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,
int strict = 0;
int attempts = 3;
int err;
- int reachable = ipv6_devconf.forwarding ? 0 : RT6_LOOKUP_F_REACHABLE;
+ int reachable = net->ipv6.devconf_all->forwarding ? 0 : RT6_LOOKUP_F_REACHABLE;
strict |= flags & RT6_LOOKUP_F_IFACE;
@@ -1058,7 +1058,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
hoplimit = idev->cnf.hop_limit;
in6_dev_put(idev);
} else
- hoplimit = ipv6_devconf.hop_limit;
+ hoplimit = dev_net(dev)->ipv6.devconf_all->hop_limit;
}
return hoplimit;
}