D53094.id164170.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53094.id164170.diff
View Options

	diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
	--- a/sys/dev/ixl/ixl.h
	+++ b/sys/dev/ixl/ixl.h
	@@ -98,10 +98,8 @@
	#include <sys/sbuf.h>
	#include <machine/smp.h>

	-#ifdef RSS
	#include <net/rss_config.h>
	#include <netinet/in_rss.h>
	-#endif

	#include "ifdi_if.h"
	#include "i40e_type.h"
	diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c
	--- a/sys/dev/ixl/ixl_pf_main.c
	+++ b/sys/dev/ixl/ixl_pf_main.c
	@@ -1023,12 +1023,8 @@
	u32 rss_seed[IXL_RSS_KEY_SIZE_REG];
	enum i40e_status_code status;

	-#ifdef RSS
	- /* Fetch the configured RSS key */
	- rss_getkey((uint8_t *) &rss_seed);
	-#else
	- ixl_get_default_rss_key(rss_seed);
	-#endif
	+ /* Fetch the configured RSS key */
	+ rss_getkey((uint8_t *) &rss_seed);
	/* Fill out hash function seed */
	if (hw->mac.type == I40E_MAC_X722) {
	struct i40e_aqc_get_set_rss_key_data key_data;
	@@ -1054,7 +1050,6 @@
	struct i40e_hw *hw = &pf->hw;
	u64 set_hena = 0, hena;

	-#ifdef RSS
	u32 rss_hash_config;

	rss_hash_config = rss_gethashconfig();
	@@ -1072,12 +1067,6 @@
	set_hena \|= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
	if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
	set_hena \|= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP);
	-#else
	- if (hw->mac.type == I40E_MAC_X722)
	- set_hena = IXL_DEFAULT_RSS_HENA_X722;
	- else
	- set_hena = IXL_DEFAULT_RSS_HENA_XL710;
	-#endif
	hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) \|
	((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32);
	hena \|= set_hena;