Skip to contentSkip to conversation

usbnet: make usbnet_get_link() fall back to ethtool_op_get_link()

PATCH Applied Bjørn Mork 2 participants 2 messages Feb 26, 2009 – Mar 2, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usbnet: make usbnet_get_link() fall back to ethtool_op_get_link()

Make usbnet_get_link() fall back to ethtool_op_get_link() instead of defaulting to 1.

This makes usbnet_get_link return valid results without the need for a driver specific check_connect or mii ops as long as the driver calls netif_carrier_{on,off}() as appropriate. cdc_ether is an example of such a driver.

drivers/net/usb/usbnet.c +2 -2
index aa31490..c32284f 100644
@@ -723,8 +723,8 @@ u32 usbnet_get_link (struct net_device *net)
 	if (dev->mii.mdio_read)
 		return mii_link_ok(&dev->mii);
 
-	/* Otherwise, say we're up (to avoid breaking scripts) */
-	return 1;
+	/* Otherwise, dtrt for drivers calling netif_carrier_{on,off} */
+	return ethtool_op_get_link(net);
 }
 EXPORT_SYMBOL_GPL(usbnet_get_link);
 
maintainer Applied
#1 lore raw

From: Bjørn Mork <[email protected]>
Date: Thu, 26 Feb 2009 18:19:18 +0100

Quoted 9 lines

Make usbnet_get_link() fall back to ethtool_op_get_link() instead of defaulting to 1.

This makes usbnet_get_link return valid results without the need for a driver specific check_connect or mii ops as long as the driver calls netif_carrier_{on,off}() as appropriate. cdc_ether is an example of such a driver.

Applied, thanks.