]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: libwx: fix the incorrect display of the queue number
authorJiawen Wu <jiawenwu@trustnetic.com>
Tue, 1 Jul 2025 07:06:25 +0000 (15:06 +0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 2 Jul 2025 21:44:55 +0000 (14:44 -0700)
When setting "ethtool -L eth0 combined 1", the number of RX/TX queue is
changed to be 1. RSS is disabled at this moment, and the indices of FDIR
have not be changed in wx_set_rss_queues(). So the combined count still
shows the previous value. This issue was introduced when supporting
FDIR. Fix it for those devices that support FDIR.

Fixes: 34744a7749b3 ("net: txgbe: add FDIR info to ethtool ops")
Cc: stable@vger.kernel.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/A5C8FE56D6C04608+20250701070625.73680-1-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/wangxun/libwx/wx_lib.c

index c57cc4f2724970397dd2c672b381e74b7b6285b5..59840ba9c1fef224eca6883f29dab24c95d01abb 100644 (file)
@@ -1705,6 +1705,7 @@ static void wx_set_rss_queues(struct wx *wx)
 
        clear_bit(WX_FLAG_FDIR_HASH, wx->flags);
 
+       wx->ring_feature[RING_F_FDIR].indices = 1;
        /* Use Flow Director in addition to RSS to ensure the best
         * distribution of flows across cores, even when an FDIR flow
         * isn't matched.