|
|
|
|
Index: linux-2.6.25.17/drivers/net/b44.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.25.17.orig/drivers/net/b44.c 2008-10-16 23:13:19.000000000 +0200
|
|
|
|
|
+++ linux-2.6.25.17/drivers/net/b44.c 2008-11-02 12:13:38.000000000 +0100
|
|
|
|
|
@@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- return 0;
|
|
|
|
|
+ return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
|
|
|
|
|
@@ -384,7 +384,7 @@ static void b44_set_flow_ctrl(struct b44
|
|
|
|
|
__b44_set_flow_ctrl(bp, pause_enab);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#ifdef SSB_DRIVER_MIPS
|
|
|
|
|
+#ifdef CONFIG_SSB_DRIVER_MIPS
|
|
|
|
|
extern char *nvram_get(char *name);
|
|
|
|
|
static void b44_wap54g10_workaround(struct b44 *bp)
|
|
|
|
|
{
|
|
|
|
|
@@ -2211,6 +2211,10 @@ static int __devinit b44_init_one(struct
|
|
|
|
|
*/
|
|
|
|
|
b44_chip_reset(bp, B44_CHIP_RESET_FULL);
|
|
|
|
|
|
|
|
|
|
+ /* do a phy reset to test if there is an active phy */
|
|
|
|
|
+ if (b44_phy_reset(bp) < 0)
|
|
|
|
|
+ bp->phy_addr = B44_PHY_ADDR_NO_PHY;
|
|
|
|
|
+
|
|
|
|
|
printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\n",
|
|
|
|
|
dev->name, print_mac(mac, dev->dev_addr));
|
|
|
|
|
|
