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

Commit e875a409 authored by Jun Xiao's avatar Jun Xiao Committed by Greg Kroah-Hartman
Browse files

net: hns: Fix WARNING when hns modules installed 



Commit dfdf26babc98 upstream

this patch need merge to 4.19.y stable kernel

Fix Conflict:already fixed the confilct dfdf26babc98 with Yonglong Liu

stable candidate:user cannot connect to the internet via hns dev
by default setting without this patch

we have already verified this patch on kunpeng916 platform,
and it works well.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarJun Xiao <xiaojun2@hisilicon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ce836e8

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+6 −9
Original line number Diff line number Diff line
@@ -1169,6 +1169,12 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h) 
	if (!h->phy_dev)

		return 0;



	phy_dev->supported &= h->if_support;

	phy_dev->advertising = phy_dev->supported;



	if (h->phy_if == PHY_INTERFACE_MODE_XGMII)

		phy_dev->autoneg = false;



	if (h->phy_if != PHY_INTERFACE_MODE_XGMII) {

		phy_dev->dev_flags = 0;
@@ -1180,15 +1186,6 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h) 
	if (unlikely(ret))

		return -ENODEV;



	phy_dev->supported &= h->if_support;

	phy_dev->advertising = phy_dev->supported;



	if (h->phy_if == PHY_INTERFACE_MODE_XGMII)

		phy_dev->autoneg = false;



	if (h->phy_if == PHY_INTERFACE_MODE_SGMII)

		phy_stop(phy_dev);



	return 0;

}