ubifs: remove obsolete CONFIG_UBIFS_FS_XATTR symbol

[openwrt/openwrt.git] / target / linux / generic / patches-3.14 / 702-phy_add_aneg_done_function.patch

diff --git a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
index 3137ba9a5ce071b1a927d1c6a64325dca1e0ce2a..d634647ddbe80376427f727f56caa9cd6f56f9a1 100644 (file)
--- a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
+++ b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
@@ -21,7 +21,7 @@
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -882,6 +882,9 @@ int genphy_update_link(struct phy_device
+@@ -881,6 +881,9 @@ int genphy_update_link(struct phy_device
  {
        int status;
  
@@ -33,13 +33,17 @@
        if (status < 0)
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p
+@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p
   */
  static inline int phy_aneg_done(struct phy_device *phydev)
  {
+-      int retval = phy_read(phydev, MII_BMSR);
++      int retval;
++
 +      if (phydev->drv->aneg_done)
 +              return phydev->drv->aneg_done(phydev);
 +
-       int retval = phy_read(phydev, MII_BMSR);
++      retval = phy_read(phydev, MII_BMSR);
  
        return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
+ }