diff options
author | Mitch Williams <mitch.a.williams@intel.com> | 2014-05-10 00:49:10 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-06-08 05:01:46 -0400 |
commit | ddfda80f04f139fd147f1c517e79390daa157f27 (patch) | |
tree | f702b9f22b36dc47b22b096ce149bf9a8e44281e | |
parent | e78ac4bff2f9791f479ebfa2c1a496087b321e99 (diff) |
i40e: not all VSIs have rings
Once more, with feeling: not all VSIs have rings. To assume so is to
invite null pointers to your party.
Change-ID: I576858824468d9712d119fa1015a1f28c27712c4
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index a8c96125d337..45027342c81c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -657,7 +657,7 @@ static void i40e_update_link_xoff_rx(struct i40e_pf *pf) | |||
657 | for (v = 0; v < pf->hw.func_caps.num_vsis; v++) { | 657 | for (v = 0; v < pf->hw.func_caps.num_vsis; v++) { |
658 | struct i40e_vsi *vsi = pf->vsi[v]; | 658 | struct i40e_vsi *vsi = pf->vsi[v]; |
659 | 659 | ||
660 | if (!vsi) | 660 | if (!vsi || !vsi->tx_rings[0]) |
661 | continue; | 661 | continue; |
662 | 662 | ||
663 | for (i = 0; i < vsi->num_queue_pairs; i++) { | 663 | for (i = 0; i < vsi->num_queue_pairs; i++) { |
@@ -711,7 +711,7 @@ static void i40e_update_prio_xoff_rx(struct i40e_pf *pf) | |||
711 | for (v = 0; v < pf->hw.func_caps.num_vsis; v++) { | 711 | for (v = 0; v < pf->hw.func_caps.num_vsis; v++) { |
712 | struct i40e_vsi *vsi = pf->vsi[v]; | 712 | struct i40e_vsi *vsi = pf->vsi[v]; |
713 | 713 | ||
714 | if (!vsi) | 714 | if (!vsi || !vsi->tx_rings[0]) |
715 | continue; | 715 | continue; |
716 | 716 | ||
717 | for (i = 0; i < vsi->num_queue_pairs; i++) { | 717 | for (i = 0; i < vsi->num_queue_pairs; i++) { |