From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 23 Nov 2005 11:49:35 +0000 (+0100)
Subject: [PATCH] enp2611: use 'dev' in link status timer
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~59
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c44185d4dcb92384c22e6c01dc09c25adae36a82;p=linux-2.6

[PATCH] enp2611: use 'dev' in link status timer

We assign nds[i] to a local variable 'dev', which we never use
afterwards.  Use the local variable instead.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index f0cc23d423..bc29dbeec3 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -151,12 +151,12 @@ static void enp2611_check_link_status(unsigned long __dummy)
 		dev = nds[i];
 
 		status = pm3386_is_link_up(i);
-		if (status && !netif_carrier_ok(nds[i])) {
+		if (status && !netif_carrier_ok(dev)) {
 			pm3386_enable_tx(i);
 			caleb_enable_tx(i);
-			netif_carrier_on(nds[i]);
-		} else if (!status && netif_carrier_ok(nds[i])) {
-			netif_carrier_off(nds[i]);
+			netif_carrier_on(dev);
+		} else if (!status && netif_carrier_ok(dev)) {
+			netif_carrier_off(dev);
 			caleb_disable_tx(i);
 			pm3386_disable_tx(i);
 		}