Unverified Commit 6d1d24f5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11915 ethtool: check device is present when getting link settings 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/54SMYYQ6J2ZIMOW3S7ZJDYQVXBQO4AF2/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAR4EU 
 
Link:https://gitee.com/openeuler/kernel/pulls/11915

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ab3f2869 692652fb

net/core/net-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static ssize_t speed_show(struct device *dev, 
	if (!rtnl_trylock())

		return restart_syscall();



	if (netif_running(netdev) && netif_device_present(netdev)) {

	if (netif_running(netdev)) {

		struct ethtool_link_ksettings cmd;



		if (!__ethtool_get_link_ksettings(netdev, &cmd))

net/ethtool/ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -438,6 +438,9 @@ int __ethtool_get_link_ksettings(struct net_device *dev, 
	if (!dev->ethtool_ops->get_link_ksettings)

		return -EOPNOTSUPP;



	if (!netif_device_present(dev))

		return -ENODEV;



	memset(link_ksettings, 0, sizeof(*link_ksettings));

	return dev->ethtool_ops->get_link_ksettings(dev, link_ksettings);

}