---

yaml --- r: 203957 b: refs/heads/master c: 48e9989 h: refs/heads/master i: 203955: 9681061 v: v3
git-mirror · Jul 31, 2010 · 7a4a05e · 7a4a05e
1 parent dc40dcb
commit 7a4a05e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c185276e8d820fa50a678c61abd611ee599920e
+refs/heads/master: 48e9989e033966fd738d062ea9730fe10085fdd1
diff --git a/trunk/drivers/net/benet/be_ethtool.c b/trunk/drivers/net/benet/be_ethtool.c
@@ -322,10 +322,11 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 	int status;
 	u16 intf_type;
 
-	if (adapter->link_speed < 0) {
+	if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) {
 		status = be_cmd_link_status_query(adapter, &link_up,
 						&mac_speed, &link_speed);
 
+		be_link_status_update(adapter, link_up);
 		/* link_speed is in units of 10 Mbps */
 		if (link_speed) {
 			ecmd->speed = link_speed*10;