D53100.id164286.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53100.id164286.diff
View Options

	diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c
	--- a/sys/dev/ena/ena_datapath.c
	+++ b/sys/dev/ena/ena_datapath.c
	@@ -34,9 +34,7 @@
	#ifdef DEV_NETMAP
	#include "ena_netmap.h"
	#endif /* DEV_NETMAP */
	-#ifdef RSS
	#include <net/rss_config.h>
	-#endif /* RSS */

	#include <netinet6/ip6_var.h>

	@@ -351,7 +349,6 @@
	if (likely(ENA_FLAG_ISSET(ENA_FLAG_RSS_ACTIVE, adapter))) {
	mbuf->m_pkthdr.flowid = ena_rx_ctx->hash;

	-#ifdef RSS
	/*
	* Hardware and software RSS are in agreement only when both are
	* configured to Toeplitz algorithm. This driver configures
	@@ -362,7 +359,6 @@
	M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH);
	return;
	}
	-#endif

	if (ena_rx_ctx->frag &&
	(ena_rx_ctx->l3_proto != ENA_ETH_IO_L3_PROTO_UNKNOWN)) {
	diff --git a/sys/dev/ena/ena_rss.h b/sys/dev/ena/ena_rss.h
	--- a/sys/dev/ena/ena_rss.h
	+++ b/sys/dev/ena/ena_rss.h
	@@ -36,9 +36,7 @@

	#include <sys/types.h>

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

	#include "ena.h"

	diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c
	--- a/sys/dev/ena/ena_rss.c
	+++ b/sys/dev/ena/ena_rss.c
	@@ -125,7 +125,6 @@
	}


	-#ifdef RSS
	uint8_t rss_algo = rss_gethashalgo();
	if (rss_algo == RSS_HASH_TOEPLITZ) {
	uint8_t hash_key[RSS_KEYSIZE];
	@@ -133,7 +132,6 @@
	rss_getkey(hash_key);
	rc = ena_rss_set_hash(ena_dev, hash_key);
	} else
	-#endif
	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ,
	NULL, ENA_HASH_KEY_SIZE, 0x0);
	if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) {