From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757598AbYGUBRT (ORCPT ); Sun, 20 Jul 2008 21:17:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755640AbYGUBRE (ORCPT ); Sun, 20 Jul 2008 21:17:04 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:36836 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754780AbYGUBRC (ORCPT ); Sun, 20 Jul 2008 21:17:02 -0400 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 In-Reply-To: References: <20080720.104411.81744468.davem@davemloft.net> X-Mailer: Mew version 5.2 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha.home.local id m6L1HNfq021508 From: Linus Torvalds 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 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ʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [GIT]: Networking Date: Sun, 20 Jul 2008 18:17:02 -0700 (PDT) Message-ID: <20080720.181702.239050112.davem@davemloft.net> References: <20080720.104411.81744468.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-7 Content-Transfer-Encoding: base64 Cc: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, yoshfuji@linux-ipv6.org To: torvalds@linux-foundation.org Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:36836 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754780AbYGUBRC (ORCPT ); Sun, 20 Jul 2008 21:17:02 -0400 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: RnJvbTogTGludXMgVG9ydmFsZHMgPHRvcnZhbGRzQGxpbnV4LWZvdW5kYXRpb24ub3JnPg0KRGF0 ZTogU3VuLCAyMCBKdWwgMjAwOCAxODowNzoyOCAtMDcwMCAoUERUKQ0KDQo+IFRoaXMgd2Fybmlu ZyBhbHNvIHNlZW1zIHRvIGJlIG5ldzoNCj4gDQo+IAluZXQvaXB2Ni9hZGRyY29uZi5jOiBJbiBm dW5jdGlvbiChYWRkcmNvbmZfYWRkX2xpbmtsb2NhbKI6DQo+IAluZXQvaXB2Ni9hZGRyY29uZi5j OjIzMTg6IHdhcm5pbmc6IHVudXNlZCB2YXJpYWJsZSChbmV0og0KPiANCj4gYW5kIGxvb2tpbmcg YXQgdGhlIGNvZGUgaXQncyBhcHBhcmVudGx5IGJlY2F1c2UgSSdtIG5vdCBhbiBvcHRpbWlzdGlj IA0KPiBlbm91Z2ggZGFkLg0KPiANCj4gQnV0IGhleSwgaWYgeW91IGhhZCB0aHJlZSBwcmUtdGVl bmFnZSBnaXJscywgeW91IG1pZ2h0IG5vdCBiZSBhbGwgdGhhdCANCj4gb3B0aW1pc3RpYyBlaXRo ZXIuIFNvIEkgdGhpbmsgdGhhdCdzIHJlYXNvbmFibGUuDQo+IA0KPiBQcm9ibGVtIHNlZW1zIHRv IGhhdmUgYmVlbiBpbnRyb2R1Y2VkIGJ5IDUzYjc5OTdmICgiaXB2NiBuZXRuczogTWFrZSANCj4g c2V2ZXJhbCAiZ2xvYmFsIiBzeXNjdGwgdmFyaWFibGVzIG5hbWVzcGFjZSBhd2FyZSIpDQoNCkxl dCdzIGp1c3QgZXhwYW5kIHRoZSB0aGluZyBpbiB0aGUgb25lIHNwb3QgaXQgZ2V0cw0KcmVmZXJl bmNlZCBpbi4NCg0KUGxlYXNlIGFwcGx5LCB0aGFua3MuDQoNCmlwdjY6IEZpeCB3YXJuaW5nIGlu IGFkZHJjb25mIGNvZGUuDQoNClJlcG9ydGVkIGJ5IExpbnVzLg0KDQpTaWduZWQtb2ZmLWJ5OiBE YXZpZCBTLiBNaWxsZXIgPGRhdmVtQGRhdmVtbG9mdC5uZXQ+DQoNCmRpZmYgLS1naXQgYS9uZXQv aXB2Ni9hZGRyY29uZi5jIGIvbmV0L2lwdjYvYWRkcmNvbmYuYw0KaW5kZXggNTgwYWU1MC4uOWY0 ZmNjZSAxMDA2NDQNCi0tLSBhL25ldC9pcHY2L2FkZHJjb25mLmMNCisrKyBiL25ldC9pcHY2L2Fk ZHJjb25mLmMNCkBAIC0yMzE1LDEyICsyMzE1LDExIEBAIHN0YXRpYyB2b2lkIGluaXRfbG9vcGJh Y2soc3RydWN0IG5ldF9kZXZpY2UgKmRldikNCiBzdGF0aWMgdm9pZCBhZGRyY29uZl9hZGRfbGlu a2xvY2FsKHN0cnVjdCBpbmV0Nl9kZXYgKmlkZXYsIHN0cnVjdCBpbjZfYWRkciAqYWRkcikNCiB7 DQogCXN0cnVjdCBpbmV0Nl9pZmFkZHIgKiBpZnA7DQotCXN0cnVjdCBuZXQgKm5ldCA9IGRldl9u ZXQoaWRldi0+ZGV2KTsNCiAJdTMyIGFkZHJfZmxhZ3MgPSBJRkFfRl9QRVJNQU5FTlQ7DQogDQog I2lmZGVmIENPTkZJR19JUFY2X09QVElNSVNUSUNfREFEDQogCWlmIChpZGV2LT5jbmYub3B0aW1p c3RpY19kYWQgJiYNCi0JICAgICFuZXQtPmlwdjYuZGV2Y29uZl9hbGwtPmZvcndhcmRpbmcpDQor CSAgICAhZGV2X25ldChpZGV2LT5kZXYpLT5pcHY2LmRldmNvbmZfYWxsLT5mb3J3YXJkaW5nKQ0K IAkJYWRkcl9mbGFncyB8PSBJRkFfRl9PUFRJTUlTVElDOw0KICNlbmRpZg0KIA0K