Commit 9e20ec25 authored by Duanqiang Wen's avatar Duanqiang Wen Committed by Wen Zhiwei
Browse files

Revert "net: libwx: fix alloc msix vectors failed" 

stable inclusion
from stable-v6.6.54
commit 79fec62d0f9bba88a6f9e2194db3eecace266d65
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ3K2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=79fec62d0f9bba88a6f9e2194db3eecace266d65



--------------------------------

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: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 922917a4

drivers/net/ethernet/wangxun/libwx/wx_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1598,7 +1598,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;



	/* We start by asking for one vector per queue pair */