Commit f049b826 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ice: remove unused args from ice_get_open_tunnel_port() 



ice_get_open_tunnel_port() is always passed TNL_ALL
as the second parameter.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40a98cb6

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

+2 −4
Original line number Diff line number Diff line
@@ -1268,8 +1268,7 @@ ice_fdir_write_all_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, 
		bool is_tun = tun == ICE_FD_HW_SEG_TUN;

		int err;



		if (is_tun && !ice_get_open_tunnel_port(&pf->hw, TNL_ALL,

							&port_num))

		if (is_tun && !ice_get_open_tunnel_port(&pf->hw, &port_num))

			continue;

		err = ice_fdir_write_fltr(pf, input, add, is_tun);

		if (err)
@@ -1647,8 +1646,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd) 
	}



	/* return error if not an update and no available filters */

	fltrs_needed = ice_get_open_tunnel_port(hw, TNL_ALL, &tunnel_port) ?

		2 : 1;

	fltrs_needed = ice_get_open_tunnel_port(hw, &tunnel_port) ? 2 : 1;

	if (!ice_fdir_find_fltr_by_idx(hw, fsp->location) &&

	    ice_fdir_num_avail_fltr(hw, pf->vsi[vsi->idx]) < fltrs_needed) {

		dev_err(dev, "Failed to add filter.  The maximum number of flow director filters has been reached.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, 
		memcpy(pkt, ice_fdir_pkt[idx].pkt, ice_fdir_pkt[idx].pkt_len);

		loc = pkt;

	} else {

		if (!ice_get_open_tunnel_port(hw, TNL_ALL, &tnl_port))

		if (!ice_get_open_tunnel_port(hw, &tnl_port))

			return ICE_ERR_DOES_NOT_EXIST;

		if (!ice_fdir_pkt[idx].tun_pkt)

			return ICE_ERR_PARAM;

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

+2 −5
Original line number Diff line number Diff line
@@ -1696,12 +1696,10 @@ ice_find_free_tunnel_entry(struct ice_hw *hw, enum ice_tunnel_type type, 
/**

 * ice_get_open_tunnel_port - retrieve an open tunnel port

 * @hw: pointer to the HW structure

 * @type: tunnel type (TNL_ALL will return any open port)

 * @port: returns open port

 */

bool

ice_get_open_tunnel_port(struct ice_hw *hw, enum ice_tunnel_type type,

			 u16 *port)

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port)

{

	bool res = false;

	u16 i;
@@ -1709,8 +1707,7 @@ ice_get_open_tunnel_port(struct ice_hw *hw, enum ice_tunnel_type type, 
	mutex_lock(&hw->tnl_lock);



	for (i = 0; i < hw->tnl.count && i < ICE_TUNNEL_MAX_ENTRIES; i++)

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

		    (type == TNL_ALL || hw->tnl.tbl[i].type == type)) {

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

			*port = hw->tnl.tbl[i].port;

			res = true;

			break;

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

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
#define ICE_PKG_CNT 4



bool

ice_get_open_tunnel_port(struct ice_hw *hw, enum ice_tunnel_type type,

			 u16 *port);

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port);

enum ice_status

ice_create_tunnel(struct ice_hw *hw, enum ice_tunnel_type type, u16 port);

enum ice_status ice_destroy_tunnel(struct ice_hw *hw, u16 port, bool all);