This is a note to let you know that I've just added the patch titled
net/mlx4_core: Fix the error flow when probing with invalid VF configuration
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx4_core-fix-the-error-flow-when-probing-with-invalid-vf-configuration.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Jul 26 10:16:13 PDT 2014
From: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Date: Sun, 22 Jun 2014 13:21:34 +0300
Subject: net/mlx4_core: Fix the error flow when probing with invalid VF configuration
From: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
[ Upstream commit 960b1f454e1ace6b76718f22828bcc3594a09422 ]
Single ported VF are currently not supported on configurations where
one or both ports are IB. When we hit this case, the relevant flow in
the driver didn't return error and jumped to the wrong label. Fix that.
Fixes: dd41cc3 ('net/mlx4: Adapt num_vfs/probed_vf params for single port VF')
Reported-by: Shirley Ma <shirley.ma@xxxxxxxxxx>
Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx4/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2466,7 +2466,8 @@ slave_start:
"with IB port. Single port VFs syntax"
" is only supported when all ports "
"are configured as ethernet\n");
- goto err_close;
+ err = -EINVAL;
+ goto err_master_mfunc;
}
for (i = 0; i < sizeof(nvfs)/sizeof(nvfs[0]); i++) {
unsigned j;
Patches currently in stable-queue which might be from ogerlitz@xxxxxxxxxxxx are
queue-3.15/net-mlx4_en-don-t-configure-the-hw-vxlan-parser-when-vxlan-offloading-isn-t-set.patch
queue-3.15/net-mlx4_core-fix-the-error-flow-when-probing-with-invalid-vf-configuration.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html