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: Zhu Yanjun <yanjun....@oracle.com>
---
 drivers/net/ethernet/nvidia/forcedeth.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c 
b/drivers/net/ethernet/nvidia/forcedeth.c
index 978d329..aa912f4 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -4248,11 +4248,9 @@ static int nv_get_link_ksettings(struct net_device *dev,
                /* We do not track link speed / duplex setting if the
                 * interface is disabled. Force a link check */
                if (nv_update_linkspeed(dev)) {
-                       if (!netif_carrier_ok(dev))
-                               netif_carrier_on(dev);
+                       netif_carrier_on(dev);
                } else {
-                       if (netif_carrier_ok(dev))
-                               netif_carrier_off(dev);
+                       netif_carrier_off(dev);
                }
        }
 
-- 
2.7.4

Reply via email to