From 5542ec8b665eda767c93a3844a5405cb8b348e16 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Wed, 23 Nov 2005 12:49:35 +0100 Subject: [PATCH] --- yaml --- r: 15768 b: refs/heads/master c: c44185d4dcb92384c22e6c01dc09c25adae36a82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixp2000/enp2611.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 95e750cbd0c1..39a6dcd8f850 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de287fd596e2e9ea9a29c397322d0a8b8a470cd1 +refs/heads/master: c44185d4dcb92384c22e6c01dc09c25adae36a82 diff --git a/trunk/drivers/net/ixp2000/enp2611.c b/trunk/drivers/net/ixp2000/enp2611.c index f0cc23d423ef..bc29dbeec318 100644 --- a/trunk/drivers/net/ixp2000/enp2611.c +++ b/trunk/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); }