Auto merge with /home/aegl/GIT/linus

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