aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/pegasus.c
diff options
context:
space:
mode:
authorPhilippe Reynes <tremyfr@gmail.com>2017-03-17 18:34:04 -0400
committerDavid S. Miller <davem@davemloft.net>2017-03-21 20:47:26 -0400
commit71dbc3414caaf68d1914f63864b65d2a4d0bc39c (patch)
tree686bb42df655cdbd5c7c85c30833a30e7435e342 /drivers/net/usb/pegasus.c
parent71f0cfe84b502ec20ccb2103beed13b063286f63 (diff)
net: usb: pegasus: use new api ethtool_{get|set}_link_ksettings
The ethtool api {get|set}_settings is deprecated. We move this driver to new api {get|set}_link_ksettings. As I don't have the hardware, I'd be very pleased if someone may test this patch. Signed-off-by: Philippe Reynes <tremyfr@gmail.com> Acked-by: Petko Manolov <petkan@nucleusys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/pegasus.c')
-rw-r--r--drivers/net/usb/pegasus.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 36674484c6fb..321e059e13ae 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -953,20 +953,22 @@ static inline void pegasus_reset_wol(struct net_device *dev)
953} 953}
954 954
955static int 955static int
956pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 956pegasus_get_link_ksettings(struct net_device *dev,
957 struct ethtool_link_ksettings *ecmd)
957{ 958{
958 pegasus_t *pegasus; 959 pegasus_t *pegasus;
959 960
960 pegasus = netdev_priv(dev); 961 pegasus = netdev_priv(dev);
961 mii_ethtool_gset(&pegasus->mii, ecmd); 962 mii_ethtool_get_link_ksettings(&pegasus->mii, ecmd);
962 return 0; 963 return 0;
963} 964}
964 965
965static int 966static int
966pegasus_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 967pegasus_set_link_ksettings(struct net_device *dev,
968 const struct ethtool_link_ksettings *ecmd)
967{ 969{
968 pegasus_t *pegasus = netdev_priv(dev); 970 pegasus_t *pegasus = netdev_priv(dev);
969 return mii_ethtool_sset(&pegasus->mii, ecmd); 971 return mii_ethtool_set_link_ksettings(&pegasus->mii, ecmd);
970} 972}
971 973
972static int pegasus_nway_reset(struct net_device *dev) 974static int pegasus_nway_reset(struct net_device *dev)
@@ -995,14 +997,14 @@ static void pegasus_set_msglevel(struct net_device *dev, u32 v)
995 997
996static const struct ethtool_ops ops = { 998static const struct ethtool_ops ops = {
997 .get_drvinfo = pegasus_get_drvinfo, 999 .get_drvinfo = pegasus_get_drvinfo,
998 .get_settings = pegasus_get_settings,
999 .set_settings = pegasus_set_settings,
1000 .nway_reset = pegasus_nway_reset, 1000 .nway_reset = pegasus_nway_reset,
1001 .get_link = pegasus_get_link, 1001 .get_link = pegasus_get_link,
1002 .get_msglevel = pegasus_get_msglevel, 1002 .get_msglevel = pegasus_get_msglevel,
1003 .set_msglevel = pegasus_set_msglevel, 1003 .set_msglevel = pegasus_set_msglevel,
1004 .get_wol = pegasus_get_wol, 1004 .get_wol = pegasus_get_wol,
1005 .set_wol = pegasus_set_wol, 1005 .set_wol = pegasus_set_wol,
1006 .get_link_ksettings = pegasus_get_link_ksettings,
1007 .set_link_ksettings = pegasus_set_link_ksettings,
1006}; 1008};
1007 1009
1008static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd) 1010static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)