Commit 05ffb3e2 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller

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: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cf48a10
...@@ -723,8 +723,8 @@ u32 usbnet_get_link (struct net_device *net) ...@@ -723,8 +723,8 @@ u32 usbnet_get_link (struct net_device *net)
if (dev->mii.mdio_read) if (dev->mii.mdio_read)
return mii_link_ok(&dev->mii); return mii_link_ok(&dev->mii);
/* Otherwise, say we're up (to avoid breaking scripts) */ /* Otherwise, dtrt for drivers calling netif_carrier_{on,off} */
return 1; return ethtool_op_get_link(net);
} }
EXPORT_SYMBOL_GPL(usbnet_get_link); EXPORT_SYMBOL_GPL(usbnet_get_link);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment