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

Commit 65d2897c authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

caif_usb: Make the driver name check more efficient 



Use the device model to get just the name, rather than using the
ethtool API to get all driver information.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40663634

net/caif/caif_usb.c

+3 −10
Original line number Diff line number Diff line
@@ -128,17 +128,10 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 
	struct cflayer *layer, *link_support;

	struct usbnet *usbnet;

	struct usb_device *usbdev;

	struct ethtool_drvinfo drvinfo;



	/*

	 * Quirks: High-jack ethtool to find if we have a NCM device,

	 * and find it's VID/PID.

	 */

	if (dev->ethtool_ops == NULL || dev->ethtool_ops->get_drvinfo == NULL)

		return 0;



	dev->ethtool_ops->get_drvinfo(dev, &drvinfo);

	if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0)

	/* Check whether we have a NCM device, and find its VID/PID. */

	if (!(dev->dev.parent && dev->dev.parent->driver &&

	      strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0))

		return 0;



	usbnet = netdev_priv(dev);