diff options
author | David Miller <davem@davemloft.net> | 2008-07-20 21:17:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 00:18:26 -0400 |
commit | 702beb87d6b4e08cca394b210679e5d7c2ac9383 (patch) | |
tree | 8bd3c2ae958e42dbc525a0ab3575148472dc28fe /net | |
parent | d1671a9c15f55a1475d41269494518e348880c33 (diff) |
ipv6: Fix warning in addrconf code.
Reported by Linus.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
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) | |||
2315 | static void addrconf_add_linklocal(struct inet6_dev *idev, struct in6_addr *addr) | 2315 | static 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 | ||