aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 580ae506c399..9f4fcce6379b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2315,12 +2315,11 @@ static void init_loopback(struct net_device *dev)
2315static void addrconf_add_linklocal(struct inet6_dev *idev, struct in6_addr *addr) 2315static void addrconf_add_linklocal(struct inet6_dev *idev, struct in6_addr *addr)
2316{ 2316{
2317 struct inet6_ifaddr * ifp; 2317 struct inet6_ifaddr * ifp;
2318 struct net *net = dev_net(idev->dev);
2319 u32 addr_flags = IFA_F_PERMANENT; 2318 u32 addr_flags = IFA_F_PERMANENT;
2320 2319
2321#ifdef CONFIG_IPV6_OPTIMISTIC_DAD 2320#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
2322 if (idev->cnf.optimistic_dad && 2321 if (idev->cnf.optimistic_dad &&
2323 !net->ipv6.devconf_all->forwarding) 2322 !dev_net(idev->dev)->ipv6.devconf_all->forwarding)
2324 addr_flags |= IFA_F_OPTIMISTIC; 2323 addr_flags |= IFA_F_OPTIMISTIC;
2325#endif 2324#endif
2326 2325