diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
| commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
| tree | 41fd871990e888dd5616a6bf1891a1ff307221df /drivers/net/usb/usbnet.c | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'drivers/net/usb/usbnet.c')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 723 | if (dev->mii.mdio_read) | 723 | if (dev->mii.mdio_read) |
| 724 | return mii_link_ok(&dev->mii); | 724 | return mii_link_ok(&dev->mii); |
| 725 | 725 | ||
| 726 | /* Otherwise, say we're up (to avoid breaking scripts) */ | 726 | /* Otherwise, dtrt for drivers calling netif_carrier_{on,off} */ |
| 727 | return 1; | 727 | return ethtool_op_get_link(net); |
| 728 | } | 728 | } |
| 729 | EXPORT_SYMBOL_GPL(usbnet_get_link); | 729 | EXPORT_SYMBOL_GPL(usbnet_get_link); |
| 730 | 730 | ||