summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorPeng Li <lipeng321@huawei.com>2018-08-27 09:59:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-10 08:55:53 +0200
commit4440af5a7e453a7abb66debafd9cdab6c9159462 (patch)
tree11b34c208e558cbe08365e29ae3ddc9782a61110 /drivers/net/ethernet
parentf97a366fdbadf359bb27749901d45f56474e7678 (diff)
downloadlinux-stable-4440af5a7e453a7abb66debafd9cdab6c9159462.tar.gz
linux-stable-4440af5a7e453a7abb66debafd9cdab6c9159462.tar.bz2
linux-stable-4440af5a7e453a7abb66debafd9cdab6c9159462.zip
net: hns: add netif_carrier_off before change speed and duplex
[ Upstream commit 455c4401fe7a538facaffb35b906ce19f1ece474 ] If there are packets in hardware when changing the speed or duplex, it may cause hardware hang up. This patch adds netif_carrier_off before change speed and duplex in ethtool_ops.set_link_ksettings, and adds netif_carrier_on after complete the change. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/hisilicon/hns/hns_ethtool.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 2e14a3ae1d8b..c1e947bb852f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -243,7 +243,9 @@ static int hns_nic_set_link_ksettings(struct net_device *net_dev,
}
if (h->dev->ops->adjust_link) {
+ netif_carrier_off(net_dev);
h->dev->ops->adjust_link(h, (int)speed, cmd->base.duplex);
+ netif_carrier_on(net_dev);
return 0;
}