diff options
author | Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> | 2018-04-10 13:49:49 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-04-24 11:55:42 -0400 |
commit | d332a38c9519e0208f04da465bc88427db3485f6 (patch) | |
tree | d39555d59a6a5a339abb2a160cce85dab8d7a7d6 /drivers/net/ethernet/intel/ice/ice_sched.c | |
parent | 2707df9773cd2cb8b0f35b8592431b301da9d352 (diff) |
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: 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>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_sched.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c index f16ff3e4a840..2e6c1d92cc88 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.c +++ b/drivers/net/ethernet/intel/ice/ice_sched.c | |||
@@ -751,14 +751,14 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, | |||
751 | u16 num_added = 0; | 751 | u16 num_added = 0; |
752 | u32 temp; | 752 | u32 temp; |
753 | 753 | ||
754 | *num_nodes_added = 0; | ||
755 | |||
754 | if (!num_nodes) | 756 | if (!num_nodes) |
755 | return status; | 757 | return status; |
756 | 758 | ||
757 | if (!parent || layer < hw->sw_entry_point_layer) | 759 | if (!parent || layer < hw->sw_entry_point_layer) |
758 | return ICE_ERR_PARAM; | 760 | return ICE_ERR_PARAM; |
759 | 761 | ||
760 | *num_nodes_added = 0; | ||
761 | |||
762 | /* max children per node per layer */ | 762 | /* max children per node per layer */ |
763 | max_child_nodes = | 763 | max_child_nodes = |
764 | le16_to_cpu(hw->layer_info[parent->tx_sched_layer].max_children); | 764 | le16_to_cpu(hw->layer_info[parent->tx_sched_layer].max_children); |