diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:30:57 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:30:57 +0000 |
commit | 71d8c66250eef1806d680a27d175c61dd9971a5e (patch) | |
tree | 59c2c6f7f1940628111a85dabf02cbd00d18d337 /target/linux/generic/patches-2.6.38/600-phy_extension.patch | |
parent | 4a6e01fa38b1db676649047e7f1e3febd5e91b6d (diff) | |
download | upstream-71d8c66250eef1806d680a27d175c61dd9971a5e.tar.gz upstream-71d8c66250eef1806d680a27d175c61dd9971a5e.tar.bz2 upstream-71d8c66250eef1806d680a27d175c61dd9971a5e.zip |
kernel: reorganize 2.6.38 patches, clean up block2mtd patches
SVN-Revision: 26690
Diffstat (limited to 'target/linux/generic/patches-2.6.38/600-phy_extension.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/600-phy_extension.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/target/linux/generic/patches-2.6.38/600-phy_extension.patch b/target/linux/generic/patches-2.6.38/600-phy_extension.patch deleted file mode 100644 index a0624d849e..0000000000 --- a/target/linux/generic/patches-2.6.38/600-phy_extension.patch +++ /dev/null @@ -1,81 +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 -@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy - } - - phy_write(phydev, mii_data->reg_num, val); -- -+ - if (mii_data->reg_num == MII_BMCR && - val & BMCR_RESET && - phydev->drv->config_init) { -@@ -470,7 +514,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); |