Commit 5d826b7b authored by Zhu Yanjun's avatar Zhu Yanjun Committed by David S. Miller

forcedeth: remove unnecessary carrier status check

Since netif_carrier_on() will do nothing if device's
carrier is already on, so it's unnecessary to do
carrier status check.

It's the same for netif_carrier_off().
Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f411af68
...@@ -4248,11 +4248,9 @@ static int nv_get_link_ksettings(struct net_device *dev, ...@@ -4248,11 +4248,9 @@ static int nv_get_link_ksettings(struct net_device *dev,
/* We do not track link speed / duplex setting if the /* We do not track link speed / duplex setting if the
* interface is disabled. Force a link check */ * interface is disabled. Force a link check */
if (nv_update_linkspeed(dev)) { if (nv_update_linkspeed(dev)) {
if (!netif_carrier_ok(dev)) netif_carrier_on(dev);
netif_carrier_on(dev);
} else { } else {
if (netif_carrier_ok(dev)) netif_carrier_off(dev);
netif_carrier_off(dev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment