Skip to content

Commit 5d826b7

Browse files
Zhu Yanjundavem330
authored andcommitted
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: Zhu Yanjun <yanjun.zhu@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent f411af6 commit 5d826b7

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/net/ethernet/nvidia/forcedeth.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4248,11 +4248,9 @@ static int nv_get_link_ksettings(struct net_device *dev,
42484248
/* We do not track link speed / duplex setting if the
42494249
* interface is disabled. Force a link check */
42504250
if (nv_update_linkspeed(dev)) {
4251-
if (!netif_carrier_ok(dev))
4252-
netif_carrier_on(dev);
4251+
netif_carrier_on(dev);
42534252
} else {
4254-
if (netif_carrier_ok(dev))
4255-
netif_carrier_off(dev);
4253+
netif_carrier_off(dev);
42564254
}
42574255
}
42584256

0 commit comments

Comments
 (0)