From 1c195121334a465895a13f3921e296f19a8e0c7f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 11 Nov 2009 18:53:00 -0800
Subject: [PATCH] --- yaml --- r: 171500 b: refs/heads/master c:
 434a8a58d75faa7170807a7ac2fcf7f3d85a0dc3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a64c80b0cce4..13be63ce4e82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b
+refs/heads/master: 434a8a58d75faa7170807a7ac2fcf7f3d85a0dc3
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 0ab39fedd2dc..9ff8ab9a1549 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -3830,7 +3830,7 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
 {
 	struct net *net = sock_net(skb->sk);
 	int h, s_h;
-	int idx = 0, err, s_idx;
+	int idx = 0, s_idx;
 	struct net_device *dev;
 	struct inet6_dev *idev;
 	struct hlist_head *head;