summaryrefslogtreecommitdiffstats
path: root/drivers/net/sis190.c
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-09-03 00:54:25 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 18:06:52 -0400
commit21461380d30fb52b0bbf96dbcccd0b5096a7b346 (patch)
treed0fd757ee52ae17c1ef3af8d60e3af0e19e99001 /drivers/net/sis190.c
parentdc85dec68880176c8ba05f68218a161964cada46 (diff)
downloadop-kernel-dev-21461380d30fb52b0bbf96dbcccd0b5096a7b346.zip
op-kernel-dev-21461380d30fb52b0bbf96dbcccd0b5096a7b346.tar.gz
[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>
Diffstat (limited to 'drivers/net/sis190.c')
-rw-r--r--drivers/net/sis190.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index bf3440a..5f1d0ad 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 {
OpenPOWER on IntegriCloud