aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-11-23 12:49:35 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-12-01 02:25:26 -0500
commitc44185d4dcb92384c22e6c01dc09c25adae36a82 (patch)
tree7a38ba1faaf15caeed9ae41d89b3fa44caa8fbe9 /drivers
parentde287fd596e2e9ea9a29c397322d0a8b8a470cd1 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ixp2000/enp2611.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index f0cc23d423e..bc29dbeec31 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);
}