| Message ID | 20210218102038.2996-2-oneukum@suse.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | usbnet: speed reporting for devices without MDIO | expand |
On Thu, 18 Feb 2021 11:20:36 +0100 Oliver Neukum wrote: > The old generic functions assume that the devices includes > an MDIO interface. This is true only for genuine ethernet. > Devices with a higher level of abstraction or based on different > technologies do not have it. So in preparation for > supporting that, we rename the old functions to something specific. > > v2: rebased on changed upstream > v3: changed names to clearly say that this does NOT use phylib > > Signed-off-by : Oliver Neukum <oneukum@suse.com> > Tested-by: Roland Dreier <roland@kernel.org> This one does not build.
Oliver, Jakub, Can I post v4 and deal with the issues below? I can compile and test against ToT for now and I'll like to get this mess behind me. I still think the first patch in this series should revert my previous change (de658a195ee23ca6aaffe197d1d2ea040beea0a2). On Thu, Feb 18, 2021 at 10:21 AM Oliver Neukum <oneukum@suse.com> wrote: > > The old generic functions assume that the devices includes > an MDIO interface. This is true only for genuine ethernet. > Devices with a higher level of abstraction or based on different > technologies do not have it. So in preparation for > supporting that, we rename the old functions to something specific. I'd like to propose a rewrite of the commit message: 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 Nit: The v2/v3 lines should be included BELOW the '---' line since they don't belong in the commit message. Nit2: V3 folds part of a successive patch into this one. If that was intentional, the commit message needs further rewrite and the changes to usbnet.h got lost. > Signed-off-by : Oliver Neukum <oneukum@suse.com> > Tested-by: Roland Dreier <roland@kernel.org> > --- > drivers/net/usb/asix_devices.c | 12 ++++++------ > drivers/net/usb/cdc_ncm.c | 4 ++-- > drivers/net/usb/dm9601.c | 4 ++-- > drivers/net/usb/mcs7830.c | 4 ++-- > drivers/net/usb/sierra_net.c | 4 ++-- > drivers/net/usb/smsc75xx.c | 4 ++-- > drivers/net/usb/sr9700.c | 4 ++-- > drivers/net/usb/sr9800.c | 4 ++-- > drivers/net/usb/usbnet.c | 36 ++++++++++++++++++++++++++++------ > include/linux/usb/usbnet.h | 6 ++++-- > 10 files changed, 54 insertions(+), 28 deletions(-) > > diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c > index 6e13d8165852..19a8fafb8f04 100644 > --- a/drivers/net/usb/asix_devices.c > +++ b/drivers/net/usb/asix_devices.c > @@ -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) > diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c > index 4087c9e33781..0d26cbeb6e04 100644 > --- a/drivers/net/usb/cdc_ncm.c > +++ b/drivers/net/usb/cdc_ncm.c > @@ -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_internal, > + .set_link_ksettings = usbnet_set_link_ksettings_mii, > }; > > static u32 cdc_ncm_check_rx_max(struct usbnet *dev, u32 new_rx) > diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c > index b5d2ac55a874..89cc61d7a675 100644 > --- a/drivers/net/usb/dm9601.c > +++ b/drivers/net/usb/dm9601.c > @@ -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) > diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c > index fc512b780d15..9f9352a4522f 100644 > --- a/drivers/net/usb/mcs7830.c > +++ b/drivers/net/usb/mcs7830.c > @@ -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 = { > diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c > index 55a244eca5ca..55025202dc4f 100644 > --- a/drivers/net/usb/sierra_net.c > +++ b/drivers/net/usb/sierra_net.c > @@ -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) > diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c > index 4353b370249f..f8cdabb9ef5a 100644 > --- a/drivers/net/usb/smsc75xx.c > +++ b/drivers/net/usb/smsc75xx.c > @@ -741,8 +741,8 @@ static const struct ethtool_ops smsc75xx_ethtool_ops = { > .set_eeprom = smsc75xx_ethtool_set_eeprom, > .get_wol = smsc75xx_ethtool_get_wol, > .set_wol = smsc75xx_ethtool_set_wol, > - .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 smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) > diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c > index 878557ad03ad..ce29261263cd 100644 > --- a/drivers/net/usb/sr9700.c > +++ b/drivers/net/usb/sr9700.c > @@ -250,8 +250,8 @@ static const struct ethtool_ops sr9700_ethtool_ops = { > .get_eeprom_len = sr9700_get_eeprom_len, > .get_eeprom = sr9700_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 sr9700_set_multicast(struct net_device *netdev) > diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c > index da56735d7755..a822d81310d5 100644 > --- a/drivers/net/usb/sr9800.c > +++ b/drivers/net/usb/sr9800.c > @@ -527,8 +527,8 @@ static const struct ethtool_ops sr9800_ethtool_ops = { > .get_eeprom_len = sr_get_eeprom_len, > .get_eeprom = sr_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 int sr9800_link_reset(struct usbnet *dev) > diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c > index b4c8080e6f87..f3e5ad9befd0 100644 > --- a/drivers/net/usb/usbnet.c > +++ b/drivers/net/usb/usbnet.c > @@ -944,7 +944,10 @@ EXPORT_SYMBOL_GPL(usbnet_open); > * they'll probably want to use this base set. > */ > > -int usbnet_get_link_ksettings(struct net_device *net, > +/* These methods are written on the assumption that the device > + * uses MII > + */ > +int usbnet_get_link_ksettings_mii(struct net_device *net, > struct ethtool_link_ksettings *cmd) > { > struct usbnet *dev = netdev_priv(net); > @@ -956,9 +959,30 @@ int usbnet_get_link_ksettings(struct net_device *net, > > return 0; > } > -EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings); > +EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings_mii); > + > +int usbnet_get_link_ksettings_internal(struct net_device *net, > + struct ethtool_link_ksettings *cmd) > +{ > + struct usbnet *dev = netdev_priv(net); > + > + /* the assumption that speed is equal on tx and rx > + * is deeply engrained into the networking layer. > + * For wireless stuff it is not true. > + * We assume that rxspeed matters more. > + */ > + if (dev->rxspeed != SPEED_UNKNOWN) rxspeed doesn't exist yet - that was part of the successive patch (added to usbnet.h) cheers, grant > + cmd->base.speed = dev->rxspeed / 1000000; > + else if (dev->txspeed != SPEED_UNKNOWN) > + cmd->base.speed = dev->txspeed / 1000000; > + else > + cmd->base.speed = SPEED_UNKNOWN; > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings_internal); > > -int usbnet_set_link_ksettings(struct net_device *net, > +int usbnet_set_link_ksettings_mii(struct net_device *net, > const struct ethtool_link_ksettings *cmd) > { > struct usbnet *dev = netdev_priv(net); > @@ -978,7 +1002,7 @@ int usbnet_set_link_ksettings(struct net_device *net, > > return retval; > } > -EXPORT_SYMBOL_GPL(usbnet_set_link_ksettings); > +EXPORT_SYMBOL_GPL(usbnet_set_link_ksettings_mii); > > u32 usbnet_get_link (struct net_device *net) > { > @@ -1043,8 +1067,8 @@ static const struct ethtool_ops usbnet_ethtool_ops = { > .get_msglevel = usbnet_get_msglevel, > .set_msglevel = usbnet_set_msglevel, > .get_ts_info = ethtool_op_get_ts_info, > - .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, > }; > > /*-------------------------------------------------------------------------*/ > diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h > index cfbfd6fe01df..132c1b5e14bb 100644 > --- a/include/linux/usb/usbnet.h > +++ b/include/linux/usb/usbnet.h > @@ -267,9 +267,11 @@ 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_link_ksettings(struct net_device *net, > +extern int usbnet_get_link_ksettings_mii(struct net_device *net, > struct ethtool_link_ksettings *cmd); > -extern int usbnet_set_link_ksettings(struct net_device *net, > +extern int usbnet_get_link_ksettings_internal(struct net_device *net, > + struct ethtool_link_ksettings *cmd); > +extern int usbnet_set_link_ksettings_mii(struct net_device *net, > const struct ethtool_link_ksettings *cmd); > extern u32 usbnet_get_link(struct net_device *net); > extern u32 usbnet_get_msglevel(struct net_device *); > -- > 2.26.2 >
On Thu, Feb 18, 2021 at 07:31:41PM +0000, Grant Grundler wrote: > Oliver, Jakub, > Can I post v4 and deal with the issues below? You should probably wait for two weeks. We are far enough into the merge window that i doubt it will get picked up. So please wait, rebase, and then post. > Nit: The v2/v3 lines should be included BELOW the '---' line since > they don't belong in the commit message. netdev actually prefers them above, so we see the history of how a patched changed during review. Andrew
On Thu, Feb 18, 2021 at 7:50 PM Andrew Lunn <andrew@lunn.ch> wrote: > > On Thu, Feb 18, 2021 at 07:31:41PM +0000, Grant Grundler wrote: > > Oliver, Jakub, > > Can I post v4 and deal with the issues below? > > You should probably wait for two weeks. We are far enough into the > merge window that i doubt it will get picked up. So please wait, > rebase, and then post. ACK - thank you. > > Nit: The v2/v3 lines should be included BELOW the '---' line since > > they don't belong in the commit message. > > netdev actually prefers them above, so we see the history of how a > patched changed during review. Ok. Thanks for clarifying. :) cheers, grant > > Andrew
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 6e13d8165852..19a8fafb8f04 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -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) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 4087c9e33781..0d26cbeb6e04 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -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_internal, + .set_link_ksettings = usbnet_set_link_ksettings_mii, }; static u32 cdc_ncm_check_rx_max(struct usbnet *dev, u32 new_rx) diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index b5d2ac55a874..89cc61d7a675 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -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) diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index fc512b780d15..9f9352a4522f 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c @@ -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 = { diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index 55a244eca5ca..55025202dc4f 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -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) diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 4353b370249f..f8cdabb9ef5a 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -741,8 +741,8 @@ static const struct ethtool_ops smsc75xx_ethtool_ops = { .set_eeprom = smsc75xx_ethtool_set_eeprom, .get_wol = smsc75xx_ethtool_get_wol, .set_wol = smsc75xx_ethtool_set_wol, - .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 smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index 878557ad03ad..ce29261263cd 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -250,8 +250,8 @@ static const struct ethtool_ops sr9700_ethtool_ops = { .get_eeprom_len = sr9700_get_eeprom_len, .get_eeprom = sr9700_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 sr9700_set_multicast(struct net_device *netdev) diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index da56735d7755..a822d81310d5 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -527,8 +527,8 @@ static const struct ethtool_ops sr9800_ethtool_ops = { .get_eeprom_len = sr_get_eeprom_len, .get_eeprom = sr_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 int sr9800_link_reset(struct usbnet *dev) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index b4c8080e6f87..f3e5ad9befd0 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -944,7 +944,10 @@ EXPORT_SYMBOL_GPL(usbnet_open); * they'll probably want to use this base set. */ -int usbnet_get_link_ksettings(struct net_device *net, +/* These methods are written on the assumption that the device + * uses MII + */ +int usbnet_get_link_ksettings_mii(struct net_device *net, struct ethtool_link_ksettings *cmd) { struct usbnet *dev = netdev_priv(net); @@ -956,9 +959,30 @@ int usbnet_get_link_ksettings(struct net_device *net, return 0; } -EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings); +EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings_mii); + +int usbnet_get_link_ksettings_internal(struct net_device *net, + struct ethtool_link_ksettings *cmd) +{ + struct usbnet *dev = netdev_priv(net); + + /* the assumption that speed is equal on tx and rx + * is deeply engrained into the networking layer. + * For wireless stuff it is not true. + * We assume that rxspeed matters more. + */ + if (dev->rxspeed != SPEED_UNKNOWN) + cmd->base.speed = dev->rxspeed / 1000000; + else if (dev->txspeed != SPEED_UNKNOWN) + cmd->base.speed = dev->txspeed / 1000000; + else + cmd->base.speed = SPEED_UNKNOWN; + + return 0; +} +EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings_internal); -int usbnet_set_link_ksettings(struct net_device *net, +int usbnet_set_link_ksettings_mii(struct net_device *net, const struct ethtool_link_ksettings *cmd) { struct usbnet *dev = netdev_priv(net); @@ -978,7 +1002,7 @@ int usbnet_set_link_ksettings(struct net_device *net, return retval; } -EXPORT_SYMBOL_GPL(usbnet_set_link_ksettings); +EXPORT_SYMBOL_GPL(usbnet_set_link_ksettings_mii); u32 usbnet_get_link (struct net_device *net) { @@ -1043,8 +1067,8 @@ static const struct ethtool_ops usbnet_ethtool_ops = { .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, .get_ts_info = ethtool_op_get_ts_info, - .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, }; /*-------------------------------------------------------------------------*/ diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index cfbfd6fe01df..132c1b5e14bb 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -267,9 +267,11 @@ 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_link_ksettings(struct net_device *net, +extern int usbnet_get_link_ksettings_mii(struct net_device *net, struct ethtool_link_ksettings *cmd); -extern int usbnet_set_link_ksettings(struct net_device *net, +extern int usbnet_get_link_ksettings_internal(struct net_device *net, + struct ethtool_link_ksettings *cmd); +extern int usbnet_set_link_ksettings_mii(struct net_device *net, const struct ethtool_link_ksettings *cmd); extern u32 usbnet_get_link(struct net_device *net); extern u32 usbnet_get_msglevel(struct net_device *);
The old generic functions assume that the devices includes an MDIO interface. This is true only for genuine ethernet. Devices with a higher level of abstraction or based on different technologies do not have it. So in preparation for supporting that, we rename the old functions to something specific. v2: rebased on changed upstream v3: changed names to clearly say that this does NOT use phylib Signed-off-by : Oliver Neukum <oneukum@suse.com> Tested-by: Roland Dreier <roland@kernel.org> --- drivers/net/usb/asix_devices.c | 12 ++++++------ drivers/net/usb/cdc_ncm.c | 4 ++-- drivers/net/usb/dm9601.c | 4 ++-- drivers/net/usb/mcs7830.c | 4 ++-- drivers/net/usb/sierra_net.c | 4 ++-- drivers/net/usb/smsc75xx.c | 4 ++-- drivers/net/usb/sr9700.c | 4 ++-- drivers/net/usb/sr9800.c | 4 ++-- drivers/net/usb/usbnet.c | 36 ++++++++++++++++++++++++++++------ include/linux/usb/usbnet.h | 6 ++++-- 10 files changed, 54 insertions(+), 28 deletions(-)