diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
| commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
| tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /drivers/net/tlan.c | |
| parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
| download | linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.xz | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/net/tlan.c')
| -rw-r--r-- | drivers/net/tlan.c | 4 |
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 */ |