summaryrefslogtreecommitdiff
path: root/net/ethtool/ioctl.c
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
committerChen-Yu Tsai <wens@csie.org>2025-07-15 18:34:10 +0300
commitca5ad734d30f30a577f705926d6e16a87513a2a7 (patch)
treeb5fb169a86ac59892bd3b60c2df13e8a7cef360d /net/ethtool/ioctl.c
parent082c6a2d06c0831d236760a29953355845eee988 (diff)
parentf99d4fccd2185176baf4ecac9a49d280fc62b953 (diff)
downloadlinux-ca5ad734d30f30a577f705926d6e16a87513a2a7.tar.xz
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into sunxi/dt-for-6.17
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'net/ethtool/ioctl.c')
-rw-r--r--net/ethtool/ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 39ec920f5de7..71c828d0bf31 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1083,7 +1083,8 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,
ethtool_get_flow_spec_ring(info.fs.ring_cookie))
return -EINVAL;
- if (!xa_load(&dev->ethtool->rss_ctx, info.rss_context))
+ if (info.rss_context &&
+ !xa_load(&dev->ethtool->rss_ctx, info.rss_context))
return -EINVAL;
}