| Message ID | 1493200178-6413-1-git-send-email-zhangshengju@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Date: Wed, 26 Apr 2017 17:49:38 +0800 > 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> Applied, thank you.
diff --git a/net/core/dev.c b/net/core/dev.c index db6e315..1d02c5a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7104,13 +7104,10 @@ 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)) - netif_carrier_on(dev); - } else { - if (netif_carrier_ok(dev)) - netif_carrier_off(dev); - } + if (netif_carrier_ok(rootdev)) + netif_carrier_on(dev); + else + netif_carrier_off(dev); } EXPORT_SYMBOL(netif_stacked_transfer_operstate);
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> --- net/core/dev.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)