From: gregkh@xxxxxxxxxxxxxxxxxxx
Date: Mon, 07 Jul 2014 13:49:38 -0700
>
>
> The patch below does not apply to the 3.15-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From ce9ccb17ef5b5088172f46dd246c92523fd3a524 Mon Sep 17 00:00:00 2001
> From: Jean Sacren <sakiwit@xxxxxxxxx>
> Date: Thu, 1 May 2014 14:31:18 +0000
> Subject: [PATCH] i40e: fix passing wrong error code to i40e_open()
>
> The commit 6c167f582ea9 ("i40e: Refactor and cleanup i40e_open(),
> adding i40e_vsi_open()") introduced a new function i40e_vsi_open()
> with the regression by a typo. Due to the commit, the wrong error
> code would be passed to i40e_open(). Fix this error in
> i40e_vsi_open() by turning the macro into a negative value so that
> i40e_open() could return the pertinent error code correctly.
>
> Fixes: 6c167f582ea9 ("i40e: Refactor and cleanup i40e_open(), adding i40e_vsi_open()")
> Signed-off-by: Jean Sacren <sakiwit@xxxxxxxxx>
> Tested-by: Kavindya Deegala <kavindya.s.deegala@xxxxxxxxx>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 0b34e8b31cbd..e0e5c6a867b1 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -4333,7 +4333,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
> dev_driver_string(&pf->pdev->dev));
> err = i40e_vsi_request_irq(vsi, int_name);
> } else {
> - err = EINVAL;
> + err = -EINVAL;
> goto err_setup_rx;
> }
>From 9147ea25a13fec8d7cbdeee8059f3551afa20db8 Mon Sep 17 00:00:00 2001
From: Jean Sacren <sakiwit@xxxxxxxxx>
Date: Fri, 11 Jul 2014 12:40:14 -0600
Subject: i40e: fix passing wrong error code to i40e_open()
commit ce9ccb17ef5b5088172f46dd246c92523fd3a524 upstream.
The commit 6c167f582ea9 ("i40e: Refactor and cleanup i40e_open(),
adding i40e_vsi_open()") introduced a new function i40e_vsi_open()
with the regression by a typo. Due to the commit, the wrong error
code would be passed to i40e_open(). Fix this error in
i40e_vsi_open() by turning the macro into a negative value so that
i40e_open() could return the pertinent error code correctly.
Fixes: 6c167f582ea9 ("i40e: Refactor and cleanup i40e_open(), adding i40e_vsi_open()")
Signed-off-by: Jean Sacren <sakiwit@xxxxxxxxx>
---
Patch applies to 3.15.y branch only.
Sorry for the delay. Please review.
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index cf0761f08911..71dfd79f391a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4310,7 +4310,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
goto err_setup_rx;
if (!vsi->netdev) {
- err = EINVAL;
+ err = -EINVAL;
goto err_setup_rx;
}
snprintf(int_name, sizeof(int_name) - 1, "%s-%s",
--
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