From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 2 Sep 2005 22:54:25 +0000 (+0200)
Subject: [PATCH] sis190: unmask the link change events
X-Git-Tag: v2.6.14-rc1~748^2~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21461380d30fb52b0bbf96dbcccd0b5096a7b346;p=linux-2.6-omap-h63xx.git

[PATCH] sis190: unmask the link change events

link changes reporting does not work when the driver masks its irq event

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index bf3440aa6c2..5f1d0ad5496 100644
--- a/drivers/net/sis190.c
+++ b/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 {