| Message ID | 1409304620-23251-9-git-send-email-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 08/29/2014 01:30 PM, Jeff Kirsher wrote: > From: Jesse Brandeburg <jesse.brandeburg@intel.com> > This fixes the panic under traffic load when resetting. This issue > could also show up if/whenever there is a Tx-timeout. > Change-ID: Ie393a1f17fd5d962e56fc3bfe784899ef25402f5 > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> > Tested-by: Jim Young <jamesx.m.young@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > 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 64b8683..d37dea1 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -5289,7 +5289,7 @@ static void i40e_fdir_reinit_subtask(struct i40e_pf *pf) > **/ > static void i40e_vsi_link_event(struct i40e_vsi *vsi, bool link_up) > { > - if (!vsi) > + if (!vsi || (test_bit(__I40E_DOWN, &vsi->state))) Enclosing function call into parens is totally pointless. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 64b8683..d37dea1 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -5289,7 +5289,7 @@ static void i40e_fdir_reinit_subtask(struct i40e_pf *pf) **/ static void i40e_vsi_link_event(struct i40e_vsi *vsi, bool link_up) { - if (!vsi) + if (!vsi || (test_bit(__I40E_DOWN, &vsi->state))) return; switch (vsi->type) {