Commit e4c2efa1 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: fix getting UDP tunnel entry 



Correct parameters order in call to ice_tunnel_idx_to_entry function.

Entry in sparse port table is correct when the idx is 0. For idx 1 one
correct entry should be skipped, for idx 2 two of them should be skipped
etc. Change if condition to be true when idx is 0, which means that
previous valid entry of this tunnel type were skipped.

Fixes: b20e6c17 ("ice: convert to new udp_tunnel infrastructure")
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 73e30a62

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

+2 −2
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ static u16 ice_tunnel_idx_to_entry(struct ice_hw *hw, enum ice_tunnel_type type, 
	for (i = 0; i < hw->tnl.count && i < ICE_TUNNEL_MAX_ENTRIES; i++)

		if (hw->tnl.tbl[i].valid &&

		    hw->tnl.tbl[i].type == type &&

		    idx--)

		    idx-- == 0)

			return i;



	WARN_ON_ONCE(1);
@@ -1828,7 +1828,7 @@ int ice_udp_tunnel_set_port(struct net_device *netdev, unsigned int table, 
	u16 index;



	tnl_type = ti->type == UDP_TUNNEL_TYPE_VXLAN ? TNL_VXLAN : TNL_GENEVE;

	index = ice_tunnel_idx_to_entry(&pf->hw, idx, tnl_type);

	index = ice_tunnel_idx_to_entry(&pf->hw, tnl_type, idx);



	status = ice_create_tunnel(&pf->hw, index, tnl_type, ntohs(ti->port));

	if (status) {