From 53be90e5ecce5000cf45ff1c0d71b7fe407c6465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Sun, 1 Mar 2009 20:45:40 -0800
Subject: [PATCH] --- yaml --- r: 131971 b: refs/heads/master c:
 05ffb3e287dfa8ad9fdf29089837b54bc6473303 h: refs/heads/master i:   131969:
 568737415821af9db9d0ecef4e8cc260778fc029   131967:
 47881ee69e9e15e94c06c1a1cb38f716840c658a v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/usbnet.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 019260eb08f4..b095430fff88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cf48a10aa1f45c7b1f1117a829f2f8a1a1309e2
+refs/heads/master: 05ffb3e287dfa8ad9fdf29089837b54bc6473303
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index aa3149078888..c32284ff3f54 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/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);