Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0575c86b authored by Zhang Shengju's avatar Zhang Shengju Committed by David S. Miller
Browse files

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: default avatarZhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ecbc40a

net/core/dev.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -7245,14 +7245,11 @@ void netif_stacked_transfer_operstate(const struct net_device *rootdev, 
	else

	else

		netif_dormant_off(dev);

		netif_dormant_off(dev);





	if (netif_carrier_ok(rootdev)) {

	if (netif_carrier_ok(rootdev))

		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);

}

}

}

EXPORT_SYMBOL(netif_stacked_transfer_operstate);

EXPORT_SYMBOL(netif_stacked_transfer_operstate);





#ifdef CONFIG_SYSFS

#ifdef CONFIG_SYSFS