diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-08 16:58:06 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-08 16:58:06 +0000 |
| commit | cfa9a1f6d6874f3cd1601e15664281c5184ce8ea (patch) | |
| tree | 35ec283e7509baa64df1198dc1daef4a8d88e482 /target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch | |
| parent | ce6b70119c97a254277a07a169501018fb7c3805 (diff) | |
| download | master-31e0f0ae-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.tar.gz master-31e0f0ae-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.tar.bz2 master-31e0f0ae-cfa9a1f6d6874f3cd1601e15664281c5184ce8ea.zip | |
brcm47xx: add kernel 2.6.35 preliminary support
SVN-Revision: 21707
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch new file mode 100644 index 0000000000..1f8de8d9be --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.35/210-b44_phy_fix.patch @@ -0,0 +1,66 @@ +--- a/drivers/net/b44.c ++++ b/drivers/net/b44.c +@@ -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) + { +@@ -421,12 +421,45 @@ static inline void b44_wap54g10_workarou + } + #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) ++{ ++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */ ++ if (simple_strtoul(getvar("boardnum"), NULL, 0) == 100) { ++ 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 +2122,8 @@ static int __devinit b44_get_invariants( + * 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])){ |