brcm47xx: 2.6.28 was accidentally committed with the old (and conceptually broken...

SVN-Revision: 15351

diff --git a/target/linux/brcm47xx/patches-2.6.28/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.28/210-b44_phy_fix.patch
index f990b8534bd30545e543be49fd7cff63dfa6ed70..e38332eb639aaacc5b3815aedf829ff025092d75 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.28/210-b44_phy_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/210-b44_phy_fix.patch
@@ -1,5 +1,14 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c

+@@ -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);
  }
 @@ -384,7 +384,7 @@ static void b44_set_flow_ctrl(struct b44
        __b44_set_flow_ctrl(bp, pause_enab);
  }


@@ -9,41 +18,14 @@
  extern char *nvram_get(char *name);
  static void b44_wap54g10_workaround(struct b44 *bp)
  {
  extern char *nvram_get(char *name);
  static void b44_wap54g10_workaround(struct b44 *bp)
  {

-@@ -2068,6 +2068,28 @@ out:
-       return err;
- }
+@@ -2213,6 +2213,10 @@ static int __devinit b44_init_one(struct
+        */
+       b44_chip_reset(bp, B44_CHIP_RESET_FULL);

  
  

-+#ifdef CONFIG_SSB_DRIVER_MIPS
-+static void b44_wrtsl54gs_workaround(struct b44 *bp)
-+{
-+      const char *str;
-+
-+      /*
-+       * 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
-+       */
-+      str = nvram_get("boardnum");
-+      if (!str)
-+              return;
-+      if (simple_strtoul(str, NULL, 0) == 42) {
++      /* 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;
 +              bp->phy_addr = B44_PHY_ADDR_NO_PHY;

-+      }
-+      return;
-+}
-+#else
-+static void b44_wrtsl54gs_workaround(struct b44 *bp) { }
-+#endif
-+
- static int __devinit b44_get_invariants(struct b44 *bp)
- {
-       struct ssb_device *sdev = bp->sdev;
-@@ -2089,6 +2111,8 @@ static int __devinit b44_get_invariants(
-        * valid PHY address. */
-       bp->phy_addr &= 0x1F;
- 
-+      b44_wrtsl54gs_workaround(bp);

 +
 +

-       memcpy(bp->dev->dev_addr, addr, 6);
+       printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));

  
  

-       if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){