From ef9a1d85dd22b2fdcd6d7e97698b992f7415d9b4 Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 3 Sep 2005 00:54:25 +0200
Subject: [PATCH] --- yaml --- r: 7270 b: refs/heads/master c:
 21461380d30fb52b0bbf96dbcccd0b5096a7b346 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sis190.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 046aaec58745..9b0c10a803cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc85dec68880176c8ba05f68218a161964cada46
+refs/heads/master: 21461380d30fb52b0bbf96dbcccd0b5096a7b346
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
index bf3440aa6c24..5f1d0ad54969 100644
--- a/trunk/drivers/net/sis190.c
+++ b/trunk/drivers/net/sis190.c
@@ -360,7 +360,7 @@ MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
 
 static const u32 sis190_intr_mask =
-	RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt;
+	RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange;
 
 /*
  * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
@@ -923,6 +923,7 @@ static void sis190_phy_task(void * data)
 		     BMSR_ANEGCOMPLETE)) {
 		net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n",
 			 dev->name);
+		netif_carrier_off(dev);
 		mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET);
 		mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT);
 	} else {