brcm47xx: b44: This updates the phylib patches to the version send upstream

[openwrt.git] / target / linux / brcm47xx / patches-3.10 / 210-b44_phy_fix.patch

diff --git a/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch
index 53989ef09493868762091dfbdc50bbf7df441152..452ea2eb0a1973f90476bac85e376da2d82bf6d1 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch
+++ b/target/linux/brcm47xx/patches-3.10/210-b44_phy_fix.patch
@@ -12,14 +12,14 @@
 +
 +      /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
 +      if (sdev->bus->sprom.board_num == 100) {
-+              bp->phy_addr = B44_PHY_ADDR_NO_LOACL_PHY;
++              bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
 +      } else {
 +              /* WL-HDD */
 +              if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
 +                  !strncmp(buf, "WL300-", strlen("WL300-"))) {
 +                      if (sdev->bus->sprom.et0phyaddr == 0 &&
 +                          sdev->bus->sprom.et1phyaddr == 1)
-+                              bp->phy_addr = B44_PHY_ADDR_NO_LOACL_PHY;
++                              bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
 +              }
 +      }
 +      return;
@@ -43,7 +43,7 @@
  
        if (bp->flags & B44_FLAG_EXTERNAL_PHY)
                return 0;
-@@ -2160,6 +2185,8 @@ static int b44_get_invariants(struct b44
+@@ -2162,6 +2187,8 @@ static int b44_get_invariants(struct b44
         * valid PHY address. */
        bp->phy_addr &= 0x1F;