lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automatic merge of /spare/repo/netdev-2.6 branch iff-running

Browse Source
This commit is contained in:
2005-06-04 17:11:28 -04:00
committed by Jeff Garzik
parent 91bcc018f9 7d17c1d606
commit 140fedb5f2
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/tlan.c
View File

@@ -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 */