Page MenuHomeFreeBSD
Files F142912756

D53101.diff
No OneTemporary
Actions

D53101.diff
View Options

diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c
--- a/sys/dev/liquidio/lio_main.c
+++ b/sys/dev/liquidio/lio_main.c
@@ -64,10 +64,8 @@
TUNABLE_INT("hw.lio.num_queues_per_pf0", &num_queues_per_pf0);
TUNABLE_INT("hw.lio.num_queues_per_pf1", &num_queues_per_pf1);
-#ifdef RSS
static int lio_rss = 1;
TUNABLE_INT("hw.lio.rss", &lio_rss);
-#endif /* RSS */
/* Hardware LRO */
unsigned int lio_hwlro = 0;
@@ -1437,13 +1435,10 @@
lio_set_feature(ifp, LIO_CMD_TNL_TX_CSUM_CTL,
LIO_CMD_TXCSUM_ENABLE);
-#ifdef RSS
if (lio_rss) {
if (lio_send_rss_param(lio))
goto setup_nic_dev_fail;
} else
-#endif /* RSS */
-
lio_set_feature(ifp, LIO_CMD_SET_FNV,
LIO_CMD_FNV_ENABLE);
diff --git a/sys/dev/liquidio/lio_network.h b/sys/dev/liquidio/lio_network.h
--- a/sys/dev/liquidio/lio_network.h
+++ b/sys/dev/liquidio/lio_network.h
@@ -125,9 +125,7 @@
/* VLAN Filtering related */
eventhandler_tag vlan_attach;
eventhandler_tag vlan_detach;
-#ifdef RSS
struct lio_rss_params_set rss_set;
-#endif /* RSS */
};
#define LIO_MAX_CORES 12
diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h
--- a/sys/dev/liquidio/lio_rss.h
+++ b/sys/dev/liquidio/lio_rss.h
@@ -34,8 +34,6 @@
#ifndef __LIO_RSS_H__
#define __LIO_RSS_H__
-#ifdef RSS
-
#include <net/rss_config.h>
#include <netinet/in_rss.h>
@@ -76,8 +74,6 @@
};
-#endif /* RSS */
-
#define LIO_RSS_HASH_IPV4 0x100
#define LIO_RSS_HASH_TCP_IPV4 0x200
#define LIO_RSS_HASH_IPV6 0x400
diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c
--- a/sys/dev/liquidio/lio_rss.c
+++ b/sys/dev/liquidio/lio_rss.c
@@ -31,8 +31,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef RSS
-
#include "lio_bsd.h"
#include "lio_common.h"
#include "lio_droq.h"
@@ -69,7 +67,11 @@
uint8_t queue_id;
for (i = 0; i < LIO_RSS_TABLE_SZ; i++) {
+#ifdef RSS
queue_id = rss_get_indirection_to_bucket(i);
+#else
+ queue_id = i;
+#endif
queue_id = queue_id % oct->num_oqs;
rss_set->fw_itable[i] = queue_id;
}
@@ -168,5 +170,3 @@
return (0);
}
-
-#endif /* RSS */

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 25, 4:32 PM (10 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27950807
Default Alt Text
D53101.diff (2 KB)

Event Timeline