diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:55:07 +0000 | 
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:55:07 +0000 | 
| commit | 04e6d374b6ef4348dbad560e051e5df9de0f0338 (patch) | |
| tree | 322fc313a19bc903c788a7acf9b6fabef06b04e5 /target/linux/generic/patches-3.2/701-phy_extension.patch | |
| parent | 101d502abaabc0b7bfa14df1dfd0a77e8644e791 (diff) | |
kernel: add support for linux 3.2.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29730 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.2/701-phy_extension.patch')
| -rw-r--r-- | target/linux/generic/patches-3.2/701-phy_extension.patch | 72 | 
1 files changed, 72 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.2/701-phy_extension.patch b/target/linux/generic/patches-3.2/701-phy_extension.patch new file mode 100644 index 000000000..7090cf999 --- /dev/null +++ b/target/linux/generic/patches-3.2/701-phy_extension.patch @@ -0,0 +1,72 @@ +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -299,6 +299,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 +@@ -474,7 +518,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 +@@ -510,6 +510,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);  | 
