[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210713122028.463450-1-mudongliangabcd@gmail.com>
Date: Tue, 13 Jul 2021 20:20:27 +0800
From: Dongliang Mu <mudongliangabcd@...il.com>
To: Jesse Brandeburg <jesse.brandeburg@...el.com>,
Tony Nguyen <anthony.l.nguyen@...el.com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Dinghao Liu <dinghao.liu@....edu.cn>,
Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
Shannon Nelson <shannon.nelson@...el.com>,
Catherine Sullivan <catherine.sullivan@...el.com>
Cc: Dongliang Mu <mudongliangabcd@...il.com>,
intel-wired-lan@...ts.osuosl.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] i40e: Fix error handling code of label err_set_queues
If i40e_up_complete fails in i40e_vsi_open, it goes to err_up_complete.
The label err_set_queues has an issue: if the else branch is executed,
there is no need to execute i40e_vsi_request_irq.
Fix this by adding a condition of i40e_vsi_free_irq.
Reported-by: Dongliang Mu (mudongliangabcd@...il.com)
Fixes: 9c04cfcd4aad ("i40e: Fix error handling in i40e_vsi_open")
Fixes: c22e3c6c7912 ("i40e: prep vsi_open logic for non-netdev cases")
Signed-off-by: Dongliang Mu <mudongliangabcd@...il.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 861e59a350bd..ae54468c7001 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8720,7 +8720,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
err_up_complete:
i40e_down(vsi);
err_set_queues:
- i40e_vsi_free_irq(vsi);
+ if ((vsi->netdev) || (vsi->type == I40E_VSI_FDIR))
+ i40e_vsi_free_irq(vsi);
err_setup_rx:
i40e_vsi_free_rx_resources(vsi);
err_setup_tx:
--
2.25.1
Powered by blists - more mailing lists