---

yaml --- r: 131971 b: refs/heads/master c: 05ffb3e h: refs/heads/master i: 131969: 5687374 131967: 47881ee v: v3
git-mirror · Mar 2, 2009 · 53be90e · 53be90e
1 parent 9f986e1
commit 53be90e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);