Commit bde87ad6 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: usb: usb: remove old api ethtool_{get|set}_settings 



The function usbnet_{get|set}_settings is no longer used,
so we remove it.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd4f0a75

drivers/net/usb/usbnet.c

+0 −35
Original line number Diff line number Diff line
@@ -947,39 +947,6 @@ EXPORT_SYMBOL_GPL(usbnet_open); 
 * they'll probably want to use this base set.

 */



int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)

{

	struct usbnet *dev = netdev_priv(net);



	if (!dev->mii.mdio_read)

		return -EOPNOTSUPP;



	return mii_ethtool_gset(&dev->mii, cmd);

}

EXPORT_SYMBOL_GPL(usbnet_get_settings);



int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd)

{

	struct usbnet *dev = netdev_priv(net);

	int retval;



	if (!dev->mii.mdio_write)

		return -EOPNOTSUPP;



	retval = mii_ethtool_sset(&dev->mii, cmd);



	/* link speed/duplex might have changed */

	if (dev->driver_info->link_reset)

		dev->driver_info->link_reset(dev);



	/* hard_mtu or rx_urb_size may change in link_reset() */

	usbnet_update_max_qlen(dev);



	return retval;



}

EXPORT_SYMBOL_GPL(usbnet_set_settings);



int usbnet_get_link_ksettings(struct net_device *net,

			      struct ethtool_link_ksettings *cmd)

{
@@ -1072,8 +1039,6 @@ EXPORT_SYMBOL_GPL(usbnet_set_msglevel); 


/* drivers may override default ethtool_ops in their bind() routine */

static const struct ethtool_ops usbnet_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,

include/linux/usb/usbnet.h

+0 −4
Original line number Diff line number Diff line
@@ -261,10 +261,6 @@ extern void usbnet_pause_rx(struct usbnet *); 
extern void usbnet_resume_rx(struct usbnet *);

extern void usbnet_purge_paused_rxq(struct usbnet *);



extern int usbnet_get_settings(struct net_device *net,

			       struct ethtool_cmd *cmd);

extern int usbnet_set_settings(struct net_device *net,

			       struct ethtool_cmd *cmd);

extern int usbnet_get_link_ksettings(struct net_device *net,

				     struct ethtool_link_ksettings *cmd);

extern int usbnet_set_link_ksettings(struct net_device *net,