aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_lib.c
diff options
context:
space:
mode:
authorMaciej Fijalkowski <maciej.fijalkowski@intel.com>2019-02-28 15:25:52 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-05-02 01:08:00 -0700
commita92e1bb6ade7526f0c2b7b462516b1941e965504 (patch)
tree39049c0d49109cc6fb8cac6c566b0847f2629fee /drivers/net/ethernet/intel/ice/ice_lib.c
parentice: Reduce scope of variable in ice_vsi_cfg_rxqs (diff)
downloadlinux-dev-a92e1bb6ade7526f0c2b7b462516b1941e965504.tar.xz
linux-dev-a92e1bb6ade7526f0c2b7b462516b1941e965504.zip
ice: Validate ring existence and its q_vector per VSI
When stopping Tx rings, we use 'i' as an ring array index for looking up whether the ice_ring exists and have assigned a q_vector. This checks rings only within a given TC and we need to go through every ring in VSI. Use 'q_idx' instead. Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_lib.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 61bb9e92f6ce..57b2873a6123 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2072,7 +2072,8 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
for (i = 0; i < vsi->tc_cfg.tc_info[tc].qcount_tx; i++) {
u16 v_idx;
- if (!rings || !rings[i] || !rings[i]->q_vector) {
+ if (!rings || !rings[q_idx] ||
+ !rings[q_idx]->q_vector) {
err = -EINVAL;
goto err_out;
}