Commit 0575c86b authored Apr 26, 2017 by Zhang Shengju Committed by David S. Miller Apr 27, 2017

net: 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: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8ecbc40a

net/core/dev.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -7245,14 +7245,11 @@ void netif_stacked_transfer_operstate(const struct net_device *rootdev,
		else
		netif_dormant_off(dev);

		if (netif_carrier_ok(rootdev)) {
		if (!netif_carrier_ok(dev))
		if (netif_carrier_ok(rootdev))
		netif_carrier_on(dev);
		} else {
		if (netif_carrier_ok(dev))
		else
		netif_carrier_off(dev);
		}
		}
		EXPORT_SYMBOL(netif_stacked_transfer_operstate);

		#ifdef CONFIG_SYSFS

Admin message