qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 22:21:51 +02:00
Code

brcm47xx: fix r21042, nuke (boardnum == 42 section)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21047 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-04-20 16:23:47 +00:00
parent efd153827c
commit 4cc0134d35
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch
View File

@ -1,6 +1,6 @@
--- drivers/net/b44.c.orig 2010-04-18 08:40:30.000000000 +0300 --- a/drivers/net/b44.c
+++ drivers/net/b44.c 2010-04-18 10:53:47.000000000 +0300 +++ b/drivers/net/b44.c
@@ -384,7 +384,7 @@ @@ -384,7 +384,7 @@ static void b44_set_flow_ctrl(struct b44
__b44_set_flow_ctrl(bp, pause_enab); __b44_set_flow_ctrl(bp, pause_enab);
} }
@ -9,44 +9,27 @@
extern char *nvram_get(char *name); extern char *nvram_get(char *name);
static void b44_wap54g10_workaround(struct b44 *bp) static void b44_wap54g10_workaround(struct b44 *bp)
{ {
@@ -397,6 +397,7 @@ @@ -421,12 +421,40 @@ static inline void b44_wap54g10_workarou
* see https://dev.openwrt.org/ticket/146
* check and reset bit "isolate"
*/
+
str = nvram_get("boardnum");
if (!str)
return;
@@ -421,12 +422,49 @@
} }
#endif #endif
+#ifdef CONFIG_SSB_DRIVER_MIPS +#ifdef CONFIG_SSB_DRIVER_MIPS
+static inline int startswith (const char *source, const char *cmp) +static inline int startswith (const char *source, const char *cmp)
+{ +{
+ return !strncmp(source,cmp,strlen(cmp)); + return !strncmp(source,cmp,strlen(cmp));
+} +}
+ +
+#define getvar(str) (nvram_get(str) ? : "") +#define getvar(str) (nvram_get(str) ? : "")
+ +
+static inline void b44_bcm47xx_workarounds(struct b44 *bp) +static inline void b44_bcm47xx_workarounds(struct b44 *bp)
+{ +{
+ /* + /* WL-HDD */
+ * workaround for physical wiring in Linksys WRSL54GS + struct ssb_device *sdev = bp->sdev;
+ * see https://dev.openwrt.org/ticket/2662 and 3903 + if (startswith(getvar("hardware_version"), "WL300-"))
+ * eth1 PHY is probably on BCM5325 switch accessed via eth0 + {
+ */ + if (sdev->bus->sprom.et0phyaddr == 0 &&
+ + sdev->bus->sprom.et1phyaddr == 1)
+ if (simple_strtoul(getvar("boardnum"), NULL, 0) == 42) { + bp->phy_addr = B44_PHY_ADDR_NO_PHY;
+ 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; + return;
+} +}
@ -67,7 +50,7 @@
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
return 0; return 0;
@@ -2089,6 +2127,8 @@ @@ -2089,6 +2117,8 @@ static int __devinit b44_get_invariants(
* valid PHY address. */ * valid PHY address. */
bp->phy_addr &= 0x1F; bp->phy_addr &= 0x1F;