1 --- a/drivers/net/ethernet/broadcom/b44.c
2 +++ b/drivers/net/ethernet/broadcom/b44.c
3 @@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
5 pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
8 +static void b44_bcm47xx_workarounds(struct b44 *bp)
11 + struct ssb_device *sdev = bp->sdev;
13 + /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
14 + if (sdev->bus->sprom.board_num == 100) {
15 + bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
18 + if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
19 + !strncmp(buf, "WL300-", strlen("WL300-"))) {
20 + if (sdev->bus->sprom.et0phyaddr == 0 &&
21 + sdev->bus->sprom.et1phyaddr == 1)
22 + bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
28 static inline void b44_wap54g10_workaround(struct b44 *bp)
32 +static inline void b44_bcm47xx_workarounds(struct b44 *bp)
37 static int b44_setup_phy(struct b44 *bp)
38 @@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
41 b44_wap54g10_workaround(bp);
42 + b44_bcm47xx_workarounds(bp);
44 if (bp->flags & B44_FLAG_EXTERNAL_PHY)
46 @@ -2170,6 +2195,8 @@ static int b44_get_invariants(struct b44
47 * valid PHY address. */
50 + b44_bcm47xx_workarounds(bp);
52 memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
54 if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){