From cc828546c8c1989654d897955a20819e0a167847 Mon Sep 17 00:00:00 2001
From: Micah Gruber <micah.gruber@gmail.com>
Date: Tue, 10 Jul 2007 23:04:19 -0700
Subject: [PATCH] --- yaml --- r: 59043 b: refs/heads/master c:
 dffe4f048b420f1af0b10a6090add0c5ea69e585 h: refs/heads/master i:   59041:
 70e8cfb1858f436c6226f21f21b920dd060ac6d9   59039:
 88f643a8800a6e3e6c1ba182a6995557890fa77e v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8288dc71bc8f..dd515511c886 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed8b548ce3cb988f59a0fd9af6ccdc4f8198cd19
+refs/heads/master: dffe4f048b420f1af0b10a6090add0c5ea69e585
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 11c0028863b0..95737ab040ec 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -4243,7 +4243,6 @@ int __init addrconf_init(void)
 void __exit addrconf_cleanup(void)
 {
 	struct net_device *dev;
-	struct inet6_dev *idev;
 	struct inet6_ifaddr *ifa;
 	int i;
 
@@ -4261,7 +4260,7 @@ void __exit addrconf_cleanup(void)
 	 */
 
 	for_each_netdev(dev) {
-		if ((idev = __in6_dev_get(dev)) == NULL)
+		if (__in6_dev_get(dev) == NULL)
 			continue;
 		addrconf_ifdown(dev, 1);
 	}