diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-18 20:10:51 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-18 20:10:51 +0000 |
commit | 1fd4bf270b2100ef13eb41677ff36a377d0d6dba (patch) | |
tree | 19e86293e372b4b3eea7c8a0028c50944058be5a /target/linux/generic/patches-2.6.39/701-phy_extension.patch | |
parent | 05c0d8b28e5a7cd3209181e5e9250b417e122041 (diff) | |
download | upstream-1fd4bf270b2100ef13eb41677ff36a377d0d6dba.tar.gz upstream-1fd4bf270b2100ef13eb41677ff36a377d0d6dba.tar.bz2 upstream-1fd4bf270b2100ef13eb41677ff36a377d0d6dba.zip |
linux/2.6.39: R.I.P.
SVN-Revision: 31808
Diffstat (limited to 'target/linux/generic/patches-2.6.39/701-phy_extension.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/701-phy_extension.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/target/linux/generic/patches-2.6.39/701-phy_extension.patch b/target/linux/generic/patches-2.6.39/701-phy_extension.patch deleted file mode 100644 index b2d1665cea..0000000000 --- a/target/linux/generic/patches-2.6.39/701-phy_extension.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -297,6 +297,50 @@ int phy_ethtool_gset(struct phy_device * - } - EXPORT_SYMBOL(phy_ethtool_gset); - -+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr) -+{ -+ u32 cmd; -+ int tmp; -+ struct ethtool_cmd ecmd = { ETHTOOL_GSET }; -+ struct ethtool_value edata = { ETHTOOL_GLINK }; -+ -+ if (get_user(cmd, (u32 *) useraddr)) -+ return -EFAULT; -+ -+ switch (cmd) { -+ case ETHTOOL_GSET: -+ phy_ethtool_gset(phydev, &ecmd); -+ 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; -+ return phy_ethtool_sset(phydev, &ecmd); -+ -+ case ETHTOOL_NWAY_RST: -+ /* if autoneg is off, it's an error */ -+ tmp = phy_read(phydev, MII_BMCR); -+ if (tmp & BMCR_ANENABLE) { -+ tmp |= (BMCR_ANRESTART); -+ phy_write(phydev, MII_BMCR, tmp); -+ return 0; -+ } -+ return -EINVAL; -+ -+ case ETHTOOL_GLINK: -+ edata.data = (phy_read(phydev, -+ MII_BMSR) & BMSR_LSTATUS) ? 1 : 0; -+ if (copy_to_user(useraddr, &edata, sizeof(edata))) -+ return -EFAULT; -+ return 0; -+ } -+ -+ return -EOPNOTSUPP; -+} -+EXPORT_SYMBOL(phy_ethtool_ioctl); -+ - /** - * phy_mii_ioctl - generic PHY MII ioctl interface - * @phydev: the phy_device struct -@@ -472,7 +516,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 -@@ -508,6 +508,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 ifreq *ifr, int cmd); - int phy_start_interrupts(struct phy_device *phydev); |