Commit d332a38c authored Apr 10, 2018 by Anirudh Venkataramanan Committed by Jeff Kirsher Apr 24, 2018

ice: Fix initialization for num_nodes_added



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: 5513b920 ("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>

parent 2707df97

drivers/net/ethernet/intel/ice/ice_sched.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -751,14 +751,14 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,
		u16 num_added = 0;
		u32 temp;

		*num_nodes_added = 0;

		if (!num_nodes)
		return status;

		if (!parent \|\| layer < hw->sw_entry_point_layer)
		return ICE_ERR_PARAM;

		*num_nodes_added = 0;

		/* max children per node per layer */
		max_child_nodes =
		le16_to_cpu(hw->layer_info[parent->tx_sched_layer].max_children);