summaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2008-07-21 03:17:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-21 06:18:26 +0200
commit702beb87d6b4e08cca394b210679e5d7c2ac9383 (patch)
tree8bd3c2ae958e42dbc525a0ab3575148472dc28fe /net/ipv6/addrconf.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-702beb87d6b4e08cca394b210679e5d7c2ac9383.tar.xz
linux-702beb87d6b4e08cca394b210679e5d7c2ac9383.zip
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/ipv6/addrconf.c')
-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)
static void addrconf_add_linklocal(struct inet6_dev *idev, struct in6_addr *addr)
{
struct inet6_ifaddr * ifp;
- struct net *net = dev_net(idev->dev);
u32 addr_flags = IFA_F_PERMANENT;
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
if (idev->cnf.optimistic_dad &&
- !net->ipv6.devconf_all->forwarding)
+ !dev_net(idev->dev)->ipv6.devconf_all->forwarding)
addr_flags |= IFA_F_OPTIMISTIC;
#endif