brcm47xx: misc cleanups

[oweals/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 1cafb86512e739d11597625d64442a2baa40b1f2..53989ef09493868762091dfbdc50bbf7df441152 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
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/broadcom/b44.c
 +++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -429,10 +429,34 @@ static void b44_wap54g10_workaround(stru
+@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
  error:
        pr_warning("PHY: cannot reset MII transceiver isolate bit\n");
  }
@@ -35,15 +35,15 @@
  #endif
  
  static int b44_setup_phy(struct b44 *bp)
-@@ -441,6 +465,7 @@ static int b44_setup_phy(struct b44 *bp)
+@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
        int err;
  
        b44_wap54g10_workaround(bp);
 +      b44_bcm47xx_workarounds(bp);
  
-       if (bp->phy_addr == B44_PHY_ADDR_NO_LOACL_PHY)
+       if (bp->flags & B44_FLAG_EXTERNAL_PHY)
                return 0;
-@@ -2158,6 +2183,8 @@ static int b44_get_invariants(struct b44
+@@ -2160,6 +2185,8 @@ static int b44_get_invariants(struct b44
         * valid PHY address. */
        bp->phy_addr &= 0x1F;