From: Somnath Kotur Date: Wed, 2 May 2012 03:40:16 +0000 Subject: [PATCH 54/58] be2net: Fix to not set link speed for disabled functions of a UMC card commit 22ca7a6e9a68a7e0c149b22ebed9dcd106245bb7 upstream. This renders the interface view somewhat inconsistent from the Host OS POV considering the rest of the interfaces are showing their respective speeds based on the bandwidth assigned to them. Signed-off-by: Somnath Kotur Signed-off-by: David S. Miller --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index b3b5fae..1763836 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -558,7 +558,7 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) be_link_status_update(adapter, link_status); if (link_speed) et_speed = link_speed * 10; - else + else if (link_status) et_speed = convert_to_et_speed(port_speed); } else { et_speed = adapter->phy.forced_port_speed; -- 1.7.10