summaryrefslogtreecommitdiff
path: root/net/ethtool/ioctl.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-09-03 07:42:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-09-03 07:42:58 +0200
commit35f4a629641b812e04fadef087da5d6af59e32d7 (patch)
tree9cd5010ed6c0bf18cb631e60149a16ecccd9e0f3 /net/ethtool/ioctl.c
parentfc88bb11617978fb3fcfcc697fd5c9d2dae9c4a3 (diff)
parent431c1646e1f86b949fa3685efc50b660a364c2b6 (diff)
Merge 6.11-rc6 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ethtool/ioctl.c')
-rw-r--r--net/ethtool/ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index e18823bf2330..ae041f51cd2d 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -442,6 +442,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);
}