Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6e13aea authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'usbnet-ksettings' 



Philippe Reynes says:

====================
net: usbnet: move to new api ethtool_{get|set}_link_ksettings

The ethtool api {get|set}_settings is deprecated. On usbnet, it
was often implemented with usbnet_{get|set}_settings.

In this series, I add usbnet_{get|set}_link_ksettings
in the first patch, then I update all the driver to
use this new api, and in the last patch I remove the
old api usbnet_{get|set}_settings.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 37a30b43 bde87ad6

drivers/net/usb/asix_devices.c

+6 −6
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ static const struct ethtool_ops ax88172_ethtool_ops = { 
	.get_eeprom_len		= asix_get_eeprom_len,

	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.get_settings		= usbnet_get_settings,

	.set_settings		= usbnet_set_settings,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

};



static void ax88172_set_multicast(struct net_device *net)
@@ -301,9 +301,9 @@ static const struct ethtool_ops ax88772_ethtool_ops = { 
	.get_eeprom_len		= asix_get_eeprom_len,

	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.get_settings		= usbnet_get_settings,

	.set_settings		= usbnet_set_settings,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

};



static int ax88772_link_reset(struct usbnet *dev)
@@ -775,9 +775,9 @@ static const struct ethtool_ops ax88178_ethtool_ops = { 
	.get_eeprom_len		= asix_get_eeprom_len,

	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.get_settings		= usbnet_get_settings,

	.set_settings		= usbnet_set_settings,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

};



static int marvell_phy_init(struct usbnet *dev)

drivers/net/usb/cdc_ncm.c

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ static void cdc_ncm_get_strings(struct net_device __always_unused *netdev, u32 s 
static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx);



static const struct ethtool_ops cdc_ncm_ethtool_ops = {

	.get_settings      = usbnet_get_settings,

	.set_settings      = usbnet_set_settings,

	.get_link          = usbnet_get_link,

	.nway_reset        = usbnet_nway_reset,

	.get_drvinfo       = usbnet_get_drvinfo,
@@ -142,6 +140,8 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = { 
	.get_sset_count    = cdc_ncm_get_sset_count,

	.get_strings       = cdc_ncm_get_strings,

	.get_ethtool_stats = cdc_ncm_get_ethtool_stats,

	.get_link_ksettings      = usbnet_get_link_ksettings,

	.set_link_ksettings      = usbnet_set_link_ksettings,

};



static u32 cdc_ncm_check_rx_max(struct usbnet *dev, u32 new_rx)

drivers/net/usb/dm9601.c

+2 −2
Original line number Diff line number Diff line
@@ -281,9 +281,9 @@ static const struct ethtool_ops dm9601_ethtool_ops = { 
	.set_msglevel	= usbnet_set_msglevel,

	.get_eeprom_len	= dm9601_get_eeprom_len,

	.get_eeprom	= dm9601_get_eeprom,

	.get_settings	= usbnet_get_settings,

	.set_settings	= usbnet_set_settings,

	.nway_reset	= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

};



static void dm9601_set_multicast(struct net_device *net)

drivers/net/usb/mcs7830.c

+2 −2
Original line number Diff line number Diff line
@@ -464,9 +464,9 @@ static const struct ethtool_ops mcs7830_ethtool_ops = { 
	.get_link		= usbnet_get_link,

	.get_msglevel		= usbnet_get_msglevel,

	.set_msglevel		= usbnet_set_msglevel,

	.get_settings		= usbnet_get_settings,

	.set_settings		= usbnet_set_settings,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

};



static const struct net_device_ops mcs7830_netdev_ops = {

drivers/net/usb/sierra_net.c

+2 −2
Original line number Diff line number Diff line
@@ -648,9 +648,9 @@ static const struct ethtool_ops sierra_net_ethtool_ops = { 
	.get_link = sierra_net_get_link,

	.get_msglevel = usbnet_get_msglevel,

	.set_msglevel = usbnet_set_msglevel,

	.get_settings = usbnet_get_settings,

	.set_settings = usbnet_set_settings,

	.nway_reset = usbnet_nway_reset,

	.get_link_ksettings = usbnet_get_link_ksettings,

	.set_link_ksettings = usbnet_set_link_ksettings,

};



static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)