linux/generic: refresh 2.6.37 patches

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

diff --git a/target/linux/generic/patches-2.6.36/600-phy_extension.patch b/target/linux/generic/patches-2.6.36/600-phy_extension.patch
index 5a04240..1e281dd 100644 (file)
--- a/target/linux/generic/patches-2.6.36/600-phy_extension.patch
+++ b/target/linux/generic/patches-2.6.36/600-phy_extension.patch
@@ -51,7 +51,7 @@
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
-@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy
+@@ -352,7 +396,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) {
-@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p
+@@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);
@@ -71,11 +71,11 @@
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -497,6 +497,7 @@ void phy_start_machine(struct phy_device
+@@ -519,6 +519,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);
 +int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
  int phy_mii_ioctl(struct phy_device *phydev,
-               struct mii_ioctl_data *mii_data, int cmd);
+               struct ifreq *ifr, int cmd);
  int phy_start_interrupts(struct phy_device *phydev);