kevin/linux
1
Fork 0
Code

ethtool: move netif_device_present check from ethnl_parse_header_dev_get to ethnl_ops_begin

Browse Source 
If device is runtime-suspended and not accessible then it may be
flagged as not present. If checking whether device is present is
done too early then we may bail out before we have the chance to
runtime-resume the device. Therefore move this check to
ethnl_ops_begin(). This is in preparation of a follow-up patch
that tries to runtime-resume the device before executing ethtool
ops.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2021-08-01 12:40:05 +02:00 committed by David S. Miller
parent c5ab51df03
commit 41107ac22f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ethtool/netlink.c
View File

@ -31,7 +31,13 @@ const struct nla_policy ethnl_header_policy_stats[] = {
int ethnl_ops_begin(struct net_device *dev)
{
if (dev && dev->ethtool_ops->begin)
if (!dev)
return 0;
if (!netif_device_present(dev))
return -ENODEV;
if (dev->ethtool_ops->begin)
return dev->ethtool_ops->begin(dev);
else
return 0;
@ -115,12 +121,6 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,
return -EINVAL;
}
if (dev && !netif_device_present(dev)) {
dev_put(dev);
NL_SET_ERR_MSG(extack, "device not present");
return -ENODEV;
}
req_info->dev = dev;
req_info->flags = flags;
return 0;