Commit 21461380 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

[PATCH] sis190: unmask the link change events 



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

Signed-off-by: default avatarArnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent dc85dec6

drivers/net/sis190.c

+2 −1
Original line number Diff line number Diff line
@@ -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 {