projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add v4.14 support
[openwrt/openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
drivers
/
net
/
ethernet
/
atheros
/
ag71xx
/
ag71xx_ethtool.c
diff --git
a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
index f0e102152f269c6604925421de6ca27ccc6bb6ad..a8fd5c7209fa0be5b3aa05c506689ac40424723e 100644
(file)
--- a/
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
+++ b/
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
@@
-22,7
+22,11
@@
static int ag71xx_ethtool_get_settings(struct net_device *dev,
if (!phydev)
return -ENODEV;
if (!phydev)
return -ENODEV;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
return phy_ethtool_gset(phydev, cmd);
return phy_ethtool_gset(phydev, cmd);
+#else
+ return phy_ethtool_ioctl(phydev, cmd);
+#endif
}
static int ag71xx_ethtool_set_settings(struct net_device *dev,
}
static int ag71xx_ethtool_set_settings(struct net_device *dev,
@@
-34,7
+38,11
@@
static int ag71xx_ethtool_set_settings(struct net_device *dev,
if (!phydev)
return -ENODEV;
if (!phydev)
return -ENODEV;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
return phy_ethtool_sset(phydev, cmd);
return phy_ethtool_sset(phydev, cmd);
+#else
+ return phy_ethtool_ioctl(phydev, cmd);
+#endif
}
static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
}
static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,