]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "net: libwx: fix alloc msix vectors failed"
authorDuanqiang Wen <duanqiangwen@net-swift.com>
Mon, 30 Sep 2024 07:33:27 +0000 (15:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:29:43 +0000 (16:29 +0200)
This reverts commit 69197dfc64007b5292cc960581548f41ccd44828.
commit 937d46ecc5f9 ("net: wangxun: add ethtool_ops for
channel number") changed NIC misc irq from most significant
bit to least significant bit, the former condition is not
required to apply this patch, because we only need to set
irq affinity for NIC queue irq vectors.
this patch is required after commit 937d46ecc5f9 ("net: wangxun:
add ethtool_ops for channel number") was applied, so this is only
relevant to 6.6.y branch.

Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/wangxun/libwx/wx_lib.c

index bba44ff0e2872e94846972647d9dc11a2278c2e7..c37500aa06379129a4db87b48bed9603b36cf722 100644 (file)
@@ -1585,7 +1585,7 @@ static void wx_set_num_queues(struct wx *wx)
  */
 static int wx_acquire_msix_vectors(struct wx *wx)
 {
-       struct irq_affinity affd = { .pre_vectors = 1 };
+       struct irq_affinity affd = {0, };
        int nvecs, i;
 
        nvecs = min_t(int, num_online_cpus(), wx->mac.max_msix_vectors);