Commit 5787179c authored by Larysa Zaremba's avatar Larysa Zaremba Committed by Tony Nguyen
Browse files

ice: remove headers argument from ice_tc_count_lkups 



Remove the headers argument from the ice_tc_count_lkups() function, because
it is not used anywhere.

Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarLarysa Zaremba <larysa.zaremba@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 22963454

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

+4 −9
Original line number Diff line number Diff line
@@ -12,14 +12,11 @@ 
/**

 * ice_tc_count_lkups - determine lookup count for switch filter

 * @flags: TC-flower flags

 * @headers: Pointer to TC flower filter header structure

 * @fltr: Pointer to outer TC filter structure

 *

 * Determine lookup count based on TC flower input for switch filter.

 * Return: lookup count based on TC flower input for a switch filter.

 */

static int

ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers,

		   struct ice_tc_flower_fltr *fltr)

static int ice_tc_count_lkups(u32 flags, struct ice_tc_flower_fltr *fltr)

{

	int lkups_cnt = 1; /* 0th lookup is metadata */
@@ -770,7 +767,6 @@ static int ice_eswitch_tc_parse_action(struct net_device *filter_dev, 
static int

ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr)

{

	struct ice_tc_flower_lyr_2_4_hdrs *headers = &fltr->outer_headers;

	struct ice_adv_rule_info rule_info = { 0 };

	struct ice_rule_query_data rule_added;

	struct ice_hw *hw = &vsi->back->hw;
@@ -785,7 +781,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 
		return -EOPNOTSUPP;

	}



	lkups_cnt = ice_tc_count_lkups(flags, headers, fltr);

	lkups_cnt = ice_tc_count_lkups(flags, fltr);

	list = kcalloc(lkups_cnt, sizeof(*list), GFP_ATOMIC);

	if (!list)

		return -ENOMEM;
@@ -985,7 +981,6 @@ static int 
ice_add_tc_flower_adv_fltr(struct ice_vsi *vsi,

			   struct ice_tc_flower_fltr *tc_fltr)

{

	struct ice_tc_flower_lyr_2_4_hdrs *headers = &tc_fltr->outer_headers;

	struct ice_adv_rule_info rule_info = {0};

	struct ice_rule_query_data rule_added;

	struct ice_adv_lkup_elem *list;
@@ -1021,7 +1016,7 @@ ice_add_tc_flower_adv_fltr(struct ice_vsi *vsi, 
			return PTR_ERR(dest_vsi);

	}



	lkups_cnt = ice_tc_count_lkups(flags, headers, tc_fltr);

	lkups_cnt = ice_tc_count_lkups(flags, tc_fltr);

	list = kcalloc(lkups_cnt, sizeof(*list), GFP_ATOMIC);

	if (!list)

		return -ENOMEM;