Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d08f5558 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40evf: fix overlong BIT defines 



The defines from the RSS enabling call were mistakenly
missed in the patches to the i40e which should have been
to i40evf as well.

This is a follow up to (commit ed921559886dd40528) "fix
32 bit build warnings".

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 21659035

drivers/net/ethernet/intel/i40evf/i40e_common.c

+0 −5
Original line number Diff line number Diff line
@@ -443,9 +443,6 @@ static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw, 
					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));



	cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)lut));

	cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)lut));



	status = i40evf_asq_send_command(hw, &desc, lut, lut_size, NULL);



	return status;
@@ -520,8 +517,6 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, 
					  I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &

					  I40E_AQC_SET_RSS_KEY_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID);

	cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)key));

	cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)key));



	status = i40evf_asq_send_command(hw, &desc, key, key_size, NULL);

drivers/net/ethernet/intel/i40evf/i40e_txrx.h

+7 −7
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ enum i40e_dyn_idx_t { 
	BIT_ULL(I40E_FILTER_PCTYPE_L2_PAYLOAD))



#define I40E_DEFAULT_RSS_HENA_EXPANDED (I40E_DEFAULT_RSS_HENA | \

		BIT(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \

		BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

		BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

		BIT(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \

		BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

		BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP))

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP))



#define i40e_pf_get_default_rss_hena(pf) \

	(((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \