]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ice: Validate ring existence and its q_vector per VSI
authorMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Thu, 28 Feb 2019 23:25:52 +0000 (15:25 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 2 May 2019 08:08:00 +0000 (01:08 -0700)
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>
drivers/net/ethernet/intel/ice/ice_lib.c

index 61bb9e92f6ce90b96b5f3db428ff8d6b6b00ccee..57b2873a6123c5965fab0101b3f7e74424bb3f5f 100644 (file)
@@ -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;
                        }