Date: Sun, 20 Jul 2008 18:17:02 -0700 (PDT)
Message-Id: <20080720.181702.239050112.davem@davemloft.net>
To: torvalds@linux-foundation.org
Cc: akpm@linux-foundation.org, netdev@vger.kernel.org,
       linux-kernel@vger.kernel.org, yoshfuji@linux-ipv6.org
Subject: Re: [GIT]: Networking
From: David Miller <davem@davemloft.net>
In-Reply-To: <alpine.LFD.1.10.0807201804410.31863@woody.linux-foundation.org>
References: <20080720.104411.81744468.davem@davemloft.net>
	<alpine.LFD.1.10.0807201751440.31863@woody.linux-foundation.org>
	<alpine.LFD.1.10.0807201804410.31863@woody.linux-foundation.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-7
Sender: linux-kernel-owner@vger.kernel.org
Content-Transfer-Encoding: 8bit
Content-Length: 1587
Lines: 47

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Jul 2008 18:07:28 -0700 (PDT)

> This warning also seems to be new:
> 
> 	net/ipv6/addrconf.c: In function ?addrconf_add_linklocal?:
> 	net/ipv6/addrconf.c:2318: warning: unused variable ?net?
> 
> and looking at the code it's apparently because I'm not an optimistic 
> enough dad.
> 
> But hey, if you had three pre-teenage girls, you might not be all that 
> optimistic either. So I think that's reasonable.
> 
> Problem seems to have been introduced by 53b7997f ("ipv6 netns: Make 
> several "global" sysctl variables namespace aware")

Let's just expand the thing in the one spot it gets
referenced in.

Please apply, thanks.

ipv6: Fix warning in addrconf code.

Reported by Linus.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 580ae50..9f4fcce 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
 
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?