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

Commit 296c0242 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: usbnet reports minidriver name through ethtool 



Update "usbnet" so that ethtool reports the name of the minidriver in use
(e.g. asix, cdc_ether, dm9601, rndis_host) instead of "usbnet".  This is a
better match to how other network drivers work, resolving a minor open issue.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ddda0862

drivers/usb/net/usbnet.c

+5 −3
Original line number Diff line number Diff line
@@ -734,8 +734,7 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info) 
{

	struct usbnet *dev = netdev_priv(net);



	/* REVISIT don't always return "usbnet" */

	strncpy (info->driver, driver_name, sizeof info->driver);

	strncpy (info->driver, dev->driver_name, sizeof info->driver);

	strncpy (info->version, DRIVER_VERSION, sizeof info->version);

	strncpy (info->fw_version, dev->driver_info->description,

		sizeof info->fw_version);
@@ -1115,10 +1114,12 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) 
	struct driver_info		*info;

	struct usb_device		*xdev;

	int				status;

	const char			*name;



	name = udev->dev.driver->name;

	info = (struct driver_info *) prod->driver_info;

	if (!info) {

		dev_dbg (&udev->dev, "blacklisted by %s\n", driver_name);

		dev_dbg (&udev->dev, "blacklisted by %s\n", name);

		return -ENODEV;

	}

	xdev = interface_to_usbdev (udev);
@@ -1138,6 +1139,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) 
	dev = netdev_priv(net);

	dev->udev = xdev;

	dev->driver_info = info;

	dev->driver_name = name;

	dev->msg_enable = netif_msg_init (msg_level, NETIF_MSG_DRV

				| NETIF_MSG_PROBE | NETIF_MSG_LINK);

	skb_queue_head_init (&dev->rxq);

drivers/usb/net/usbnet.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct usbnet { 
	/* housekeeping */

	struct usb_device	*udev;

	struct driver_info	*driver_info;

	const char		*driver_name;

	wait_queue_head_t	*wait;

	struct mutex		phy_mutex;