From: Bjørn Mork Date: Mon, 2 Mar 2009 04:45:40 +0000 (-0800) Subject: usbnet: make usbnet_get_link() fall back to ethtool_op_get_link() X-Git-Tag: v2.6.29-rc7~13^2~1 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=05ffb3e287dfa8ad9fdf29089837b54bc6473303;p=cascardo%2Flinux.git 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. Signed-off-by: Bjørn Mork Signed-off-by: David S. Miller --- diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index aa3149078888..c32284ff3f54 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -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);