From 7a4a05ec7e653564a4ac64080822d61e6767fe67 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Thu, 29 Jul 2010 06:17:17 +0000 Subject: [PATCH] --- yaml --- r: 203957 b: refs/heads/master c: 48e9989e033966fd738d062ea9730fe10085fdd1 h: refs/heads/master i: 203955: 9681061573cfd50f8241e0ff3df3a09c4e9529a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_ethtool.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd60c19d5164..47e56eb65fd1 100644 --- 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 index c0ade242895d..cd16243c7c36 100644 --- 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;