iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: Fix initialization for num_nodes_added

Browse Source 
ice_sched_add_nodes_to_layer is used recursively, and so we start
with num_nodes_added being 0. This way, in case of an error or if
num_nodes is NULL, the function just returns 0 to indicate that no
nodes were added.

Fixes: 5513b920a4f7 ("ice: Update Tx scheduler tree for VSI multi-Tx queue support")
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Anirudh Venkataramanan 2018-04-10 10:49:49 -07:00 committed by Jeff Kirsher
parent 2707df9773
commit d332a38c95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/ice/ice_sched.c
View File

@ -751,14 +751,14 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,
u16 num_added = 0; u16 num_added = 0;
u32 temp; u32 temp;
*num_nodes_added = 0;
if (!num_nodes) if (!num_nodes)
return status; return status;
if (!parent || layer < hw->sw_entry_point_layer) if (!parent || layer < hw->sw_entry_point_layer)
return ICE_ERR_PARAM; return ICE_ERR_PARAM;
*num_nodes_added = 0;
/* max children per node per layer */ /* max children per node per layer */
max_child_nodes = max_child_nodes =
le16_to_cpu(hw->layer_info[parent->tx_sched_layer].max_children); le16_to_cpu(hw->layer_info[parent->tx_sched_layer].max_children);