mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
9aa196e0f2
Refresh patches, following required reworking: ar71xx/patches-4.9/930-chipidea-pullup.patch layerscape/patches-4.9/302-dts-support-layercape.patch sunxi/patches-4.9/0052-stmmac-form-4-12.patch Fixes for CVEs: CVE-2018-1108 CVE-2018-1092 Tested on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Arjen de Korte <build+openwrt@de-korte.org>
73 lines
2.0 KiB
Diff
73 lines
2.0 KiB
Diff
From: John Crispin <john@phrozen.org>
|
|
Subject: net: phy: add phy_ethtool_ioctl()
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/phy/phy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/phy.h | 1 +
|
|
2 files changed, 45 insertions(+)
|
|
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -472,6 +472,50 @@ int phy_ethtool_ksettings_get(struct phy
|
|
}
|
|
EXPORT_SYMBOL(phy_ethtool_ksettings_get);
|
|
|
|
+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
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -827,6 +827,7 @@ int phy_ethtool_ksettings_get(struct phy
|
|
struct ethtool_link_ksettings *cmd);
|
|
int phy_ethtool_ksettings_set(struct phy_device *phydev,
|
|
const struct ethtool_link_ksettings *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);
|
|
void phy_print_status(struct phy_device *phydev);
|