Commit 77651900 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

usbnet: add _mii suffix to usbnet_set/get_link_ksettings 



The generic functions assumed devices provided an MDIO interface (accessed
via older mii code, not phylib). This is true only for genuine ethernet.

Devices with a higher level of abstraction or based on different
technologies do not have MDIO. To support this case, first rename
the existing functions with _mii suffix.

v2: rebased on changed upstream
v3: changed names to clearly say that this does NOT use phylib
v4: moved hunks to correct patch; reworded commmit messages

Signed-off-by : Oliver Neukum <oneukum@suse.com>
Tested-by: default avatarRoland Dreier <roland@kernel.org>
Reviewed-by: default avatarGrant Grundler <grundler@chromium.org>
Tested-by: default avatarGrant Grundler <grundler@chromium.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e880f8b3

drivers/net/usb/asix_devices.c

+6 −6
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ static const struct ethtool_ops ax88172_ethtool_ops = { 
	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

	.get_link_ksettings	= usbnet_get_link_ksettings_mii,

	.set_link_ksettings	= usbnet_set_link_ksettings_mii,

};



static void ax88172_set_multicast(struct net_device *net)
@@ -291,8 +291,8 @@ static const struct ethtool_ops ax88772_ethtool_ops = { 
	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

	.get_link_ksettings	= usbnet_get_link_ksettings_mii,

	.set_link_ksettings	= usbnet_set_link_ksettings_mii,

};



static int ax88772_link_reset(struct usbnet *dev)
@@ -782,8 +782,8 @@ static const struct ethtool_ops ax88178_ethtool_ops = { 
	.get_eeprom		= asix_get_eeprom,

	.set_eeprom		= asix_set_eeprom,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

	.get_link_ksettings	= usbnet_get_link_ksettings_mii,

	.set_link_ksettings	= usbnet_set_link_ksettings_mii,

};



static int marvell_phy_init(struct usbnet *dev)

drivers/net/usb/cdc_ncm.c

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,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,

	.get_link_ksettings      = usbnet_get_link_ksettings_mii,

	.set_link_ksettings      = usbnet_set_link_ksettings_mii,

};



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
@@ -282,8 +282,8 @@ static const struct ethtool_ops dm9601_ethtool_ops = { 
	.get_eeprom_len	= dm9601_get_eeprom_len,

	.get_eeprom	= dm9601_get_eeprom,

	.nway_reset	= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

	.get_link_ksettings	= usbnet_get_link_ksettings_mii,

	.set_link_ksettings	= usbnet_set_link_ksettings_mii,

};



static void dm9601_set_multicast(struct net_device *net)

drivers/net/usb/mcs7830.c

+2 −2
Original line number Diff line number Diff line
@@ -452,8 +452,8 @@ static const struct ethtool_ops mcs7830_ethtool_ops = { 
	.get_msglevel		= usbnet_get_msglevel,

	.set_msglevel		= usbnet_set_msglevel,

	.nway_reset		= usbnet_nway_reset,

	.get_link_ksettings	= usbnet_get_link_ksettings,

	.set_link_ksettings	= usbnet_set_link_ksettings,

	.get_link_ksettings	= usbnet_get_link_ksettings_mii,

	.set_link_ksettings	= usbnet_set_link_ksettings_mii,

};



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
@@ -629,8 +629,8 @@ static const struct ethtool_ops sierra_net_ethtool_ops = { 
	.get_msglevel = usbnet_get_msglevel,

	.set_msglevel = usbnet_set_msglevel,

	.nway_reset = usbnet_nway_reset,

	.get_link_ksettings = usbnet_get_link_ksettings,

	.set_link_ksettings = usbnet_set_link_ksettings,

	.get_link_ksettings = usbnet_get_link_ksettings_mii,

	.set_link_ksettings = usbnet_set_link_ksettings_mii,

};



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