From: Greg Kroah-Hartman Date: Sat, 18 Sep 2021 12:48:18 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.284~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6594daded23828788d06ef7e21ca8db32c8ba262;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: bnx2x-fix-enabling-network-interfaces-without-vfs.patch --- diff --git a/queue-4.4/bnx2x-fix-enabling-network-interfaces-without-vfs.patch b/queue-4.4/bnx2x-fix-enabling-network-interfaces-without-vfs.patch new file mode 100644 index 00000000000..d34666d18dc --- /dev/null +++ b/queue-4.4/bnx2x-fix-enabling-network-interfaces-without-vfs.patch @@ -0,0 +1,36 @@ +From 52ce14c134a003fee03d8fc57442c05a55b53715 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk +Date: Sun, 12 Sep 2021 22:05:23 +0300 +Subject: bnx2x: Fix enabling network interfaces without VFs + +From: Adrian Bunk + +commit 52ce14c134a003fee03d8fc57442c05a55b53715 upstream. + +This function is called to enable SR-IOV when available, +not enabling interfaces without VFs was a regression. + +Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()") +Signed-off-by: Adrian Bunk +Reported-by: YunQiang Su +Tested-by: YunQiang Su +Cc: stable@vger.kernel.org +Acked-by: Shai Malin +Link: https://lore.kernel.org/r/20210912190523.27991-1-bunk@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +@@ -1246,7 +1246,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, + + /* SR-IOV capability was enabled but there are no VFs*/ + if (iov->total == 0) { +- err = -EINVAL; ++ err = 0; + goto failed; + } + diff --git a/queue-4.4/series b/queue-4.4/series index 1129defe8ae..342845f50e0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -115,3 +115,4 @@ ath9k-fix-oob-read-ar9300_eeprom_restore_internal.patch net-fix-null-pointer-reference-in-cipso_v4_doi_free.patch parisc-fix-crash-with-signals-and-alloca.patch platform-chrome-cros_ec_proto-send-command-again-when-timeout-occurs.patch +bnx2x-fix-enabling-network-interfaces-without-vfs.patch