diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2005-09-02 18:54:25 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 18:06:52 -0400 |
commit | 21461380d30fb52b0bbf96dbcccd0b5096a7b346 (patch) | |
tree | d0fd757ee52ae17c1ef3af8d60e3af0e19e99001 /drivers/net | |
parent | dc85dec68880176c8ba05f68218a161964cada46 (diff) |
[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')
-rw-r--r-- | drivers/net/sis190.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index bf3440aa6c24..5f1d0ad54969 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -360,7 +360,7 @@ MODULE_VERSION(DRV_VERSION); | |||
360 | MODULE_LICENSE("GPL"); | 360 | MODULE_LICENSE("GPL"); |
361 | 361 | ||
362 | static const u32 sis190_intr_mask = | 362 | static const u32 sis190_intr_mask = |
363 | RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt; | 363 | RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange; |
364 | 364 | ||
365 | /* | 365 | /* |
366 | * Maximum number of multicast addresses to filter (vs. Rx-all-multicast). | 366 | * Maximum number of multicast addresses to filter (vs. Rx-all-multicast). |
@@ -923,6 +923,7 @@ static void sis190_phy_task(void * data) | |||
923 | BMSR_ANEGCOMPLETE)) { | 923 | BMSR_ANEGCOMPLETE)) { |
924 | net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n", | 924 | net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n", |
925 | dev->name); | 925 | dev->name); |
926 | netif_carrier_off(dev); | ||
926 | mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET); | 927 | mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET); |
927 | mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT); | 928 | mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT); |
928 | } else { | 929 | } else { |