update to 2.6.27.6

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.26 / 600-phy_extension.patch

diff --git a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
index 6ac585e..cacb748 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -348,6 +348,50 @@
+@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
@@ -20,7 +20,7 @@
 +              if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
 +                      return -EFAULT;
 +              return 0;
-+      
++
 +      case ETHTOOL_SSET:
 +              if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
 +                      return -EFAULT;
@@ -33,7 +33,7 @@
 +                      tmp |= (BMCR_ANRESTART);
 +                      phy_write(phydev, MII_BMCR, tmp);
 +                      return 0;
-+              }       
++              }
 +              return -EINVAL;
 +
 +      case ETHTOOL_GLINK:
@@ -51,9 +51,29 @@
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
+@@ -403,8 +447,8 @@ int phy_mii_ioctl(struct phy_device *phy
+               }
+ 
+               phy_write(phydev, mii_data->reg_num, val);
+-              
+-              if (mii_data->reg_num == MII_BMCR 
++
++              if (mii_data->reg_num == MII_BMCR
+                               && val & BMCR_RESET
+                               && phydev->drv->config_init) {
+                       phy_scan_fixups(phydev);
+@@ -524,7 +568,7 @@ static void phy_force_reduction(struct p
+       int idx;
+ 
+       idx = phy_find_setting(phydev->speed, phydev->duplex);
+-      
++
+       idx++;
+ 
+       idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -399,6 +399,7 @@
+@@ -434,6 +434,7 @@ void phy_start_machine(struct phy_device
  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);