aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/701-phy_extension.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-07-26 12:23:56 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-07-26 12:23:56 +0000
commitfce8116a3bb5411b1fd535e236ece7de9847d481 (patch)
tree4ee0e95fdffaf7737bc05046e05b4f6d38ad9615 /target/linux/generic/patches-3.6/701-phy_extension.patch
parent025d73b5a7c48ce4f2e6b3df66f4be263c68aced (diff)
downloadupstream-fce8116a3bb5411b1fd535e236ece7de9847d481.tar.gz
upstream-fce8116a3bb5411b1fd535e236ece7de9847d481.tar.bz2
upstream-fce8116a3bb5411b1fd535e236ece7de9847d481.zip
kernel: remove kernel 3.6
kernel 3.6 is not used by any target any more, remove it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41834 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/701-phy_extension.patch')
-rw-r--r--target/linux/generic/patches-3.6/701-phy_extension.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/target/linux/generic/patches-3.6/701-phy_extension.patch b/target/linux/generic/patches-3.6/701-phy_extension.patch
deleted file mode 100644
index 45464ac753..0000000000
--- a/target/linux/generic/patches-3.6/701-phy_extension.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -301,6 +301,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
-@@ -476,7 +520,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
-@@ -542,6 +542,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);