kernel: refresh patches with 2.6.34-rc4

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.34 / 600-phy_extension.patch

diff --git a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
index 966a812c0f0b62da3d8f6de8c56f85bcd6bbded4..7ae6d2ab005c985f6eabd4f3f3e597712e4e3eb6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
+@@ -298,6 +298,50 @@ int phy_ethtool_gset(struct phy_device *
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
@@ -51,7 +51,7 @@
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
-@@ -352,7 +396,7 @@ int phy_mii_ioctl(struct phy_device *phy
+@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy
                }
  
                phy_write(phydev, mii_data->reg_num, val);
@@ -60,7 +60,7 @@
                if (mii_data->reg_num == MII_BMCR &&
                    val & BMCR_RESET &&
                    phydev->drv->config_init) {
-@@ -466,7 +510,7 @@ static void phy_force_reduction(struct p
+@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p
        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);
@@ -71,7 +71,7 @@
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -491,6 +491,7 @@ void phy_start_machine(struct phy_device
+@@ -492,6 +492,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);