From: Somnath Kotur Date: Wed, 2 May 2012 03:40:16 +0000 (+0000) Subject: be2net: Fix to not set link speed for disabled functions of a UMC card X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=22ca7a6e9a68a7e0c149b22ebed9dcd106245bb7;p=linux-beck.git be2net: Fix to not set link speed for disabled functions of a UMC card 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 --- diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index 7b06f3592bd7..c9ba2cbbd518 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;