Re: [GIT]: Networking

From: David Miller
Date: Sun Jul 20 2008 - 21:17:21 EST

From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>

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;

if (idev->cnf.optimistic_dad &&
- !net->ipv6.devconf_all->forwarding)
+ !dev_net(idev->dev)->ipv6.devconf_all->forwarding)
addr_flags |= IFA_F_OPTIMISTIC;

N?§²ζμrΈ?yϊθ?Ψb²X¬ΆΗ§vΨ^?)ήΊ{.nΗ+?·??{±?κηzX§Ά?ʽά¨}©?²Ζ zΪ&j:+v?¨Ύ«?κηzZ+?Κ+zf£ʼ·h??§~?­?Ϋi?ϋΰzΉ?w?ʼΈ??¨θ­Ϊ&ʼ)ίʼf?ω^jΗ«y§m?α@A«aΆΪ? 0Άμh?ε?i