summaryrefslogtreecommitdiffstats
path: root/drivers/net/tlan.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-04 17:11:28 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-04 17:11:28 -0400
commit140fedb5f2efd1f23b26afb2d812004556ba9515 (patch)
treee645668185518a7947c3cd71b203efaa89c2332b /drivers/net/tlan.c
parent91bcc018f9fc5547875e9ec5a3dc09cbc70d4f8e (diff)
parent7d17c1d606f6e89778f05554ddea43791d5c92a0 (diff)
downloadlinux-140fedb5f2efd1f23b26afb2d812004556ba9515.tar.bz2
Automatic merge of /spare/repo/netdev-2.6 branch iff-running
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r--drivers/net/tlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 9680a308c62b..cf31c0629852 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -2819,7 +2819,7 @@ void TLan_PhyMonitor( struct net_device *dev )
if (priv->link) {
priv->link = 0;
printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
- dev->flags &= ~IFF_RUNNING;
+ netif_carrier_off(dev);
TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
return;
}
@@ -2829,7 +2829,7 @@ void TLan_PhyMonitor( struct net_device *dev )
if ((phy_status & MII_GS_LINK) && !priv->link) {
priv->link = 1;
printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
- dev->flags |= IFF_RUNNING;
+ netif_carrier_on(dev);
}
/* Setup a new monitor */