diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-20 15:03:22 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-20 15:03:22 +0000 |
| commit | bd97e8816732b1e0bd66c5f6cbb910e911fe88fd (patch) | |
| tree | 19aa9f8d46b41be544c32ba7fc5150e9c26652e0 /target/linux/brcm47xx/patches-2.6.34 | |
| parent | 7e64396394ddf2ba9d264b1ecb3af6f7c4c4eeef (diff) | |
| download | upstream-bd97e8816732b1e0bd66c5f6cbb910e911fe88fd.tar.gz upstream-bd97e8816732b1e0bd66c5f6cbb910e911fe88fd.tar.bz2 upstream-bd97e8816732b1e0bd66c5f6cbb910e911fe88fd.zip | |
brcm47xx: fix ethernet link state (closes #7056)
SVN-Revision: 21042
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch new file mode 100644 index 0000000000..d2ce214a4d --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch @@ -0,0 +1,78 @@ +--- drivers/net/b44.c.orig 2010-04-18 08:40:30.000000000 +0300 ++++ drivers/net/b44.c 2010-04-18 10:53:47.000000000 +0300 +@@ -384,7 +384,7 @@ + __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) + { +@@ -397,6 +397,7 @@ + * see https://dev.openwrt.org/ticket/146 + * check and reset bit "isolate" + */ ++ + str = nvram_get("boardnum"); + if (!str) + return; +@@ -421,12 +422,49 @@ + } + #endif + ++#ifdef CONFIG_SSB_DRIVER_MIPS ++static inline int startswith (const char *source, const char *cmp) ++{ ++ return !strncmp(source,cmp,strlen(cmp)); ++} ++ ++#define getvar(str) (nvram_get(str) ? : "") ++ ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++ /* ++ * workaround for physical wiring in Linksys WRSL54GS ++ * see https://dev.openwrt.org/ticket/2662 and 3903 ++ * eth1 PHY is probably on BCM5325 switch accessed via eth0 ++ */ ++ ++ if (simple_strtoul(getvar("boardnum"), NULL, 0) == 42) { ++ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ } else { ++ /* WL-HDD */ ++ struct ssb_device *sdev = bp->sdev; ++ if (startswith(getvar("hardware_version"), "WL300-")) { ++ if (sdev->bus->sprom.et0phyaddr == 0 && ++ sdev->bus->sprom.et1phyaddr == 1) ++ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ } ++ } ++ return; ++} ++ ++#else ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++} ++#endif ++ + static int b44_setup_phy(struct b44 *bp) + { + u32 val; + int err; + + b44_wap54g10_workaround(bp); ++ b44_bcm47xx_workarounds(bp); + + if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) + return 0; +@@ -2089,6 +2127,8 @@ + * valid PHY address. */ + bp->phy_addr &= 0x1F; + ++ b44_bcm47xx_workarounds(bp); ++ + memcpy(bp->dev->dev_addr, addr, 6); + + if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ |