Author: sbruno
Date: Mon Aug 8 18:57:50 2016
New Revision: 303847
URL: https://svnweb.freebsd.org/changeset/base/303847
Log:
Fixup ixl(4) options parsing to actually compile when using RSS/PCBGROUP
in GENERIC.
Fixup #ifdef RSS code blocks so that they build and add/delete variables
that were missesd during the creation of this code.
This code is untested and should have a big red warning on it.
Reported by: npn@
MFC after: 2 days
Modified:
head/sys/dev/ixl/ixl.h
head/sys/dev/ixl/ixl_pf_main.c
head/sys/dev/ixl/ixlvc.c
Modified: head/sys/dev/ixl/ixl.h
==============================================================================
--- head/sys/dev/ixl/ixl.h Mon Aug 8 18:31:28 2016 (r303846)
+++ head/sys/dev/ixl/ixl.h Mon Aug 8 18:57:50 2016 (r303847)
@@ -36,6 +36,10 @@
#ifndef _IXL_H_
#define _IXL_H_
+#include "opt_inet.h"
+#include "opt_inet6.h"
+#include "opt_rss.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf_ring.h>
@@ -93,12 +97,9 @@
#ifdef RSS
#include <net/rss_config.h>
+#include <netinet/in_rss.h>
#endif
-#include "opt_inet.h"
-#include "opt_inet6.h"
-#include "opt_rss.h"
-
#include "i40e_type.h"
#include "i40e_prototype.h"
Modified: head/sys/dev/ixl/ixl_pf_main.c
==============================================================================
--- head/sys/dev/ixl/ixl_pf_main.c Mon Aug 8 18:31:28 2016
(r303846)
+++ head/sys/dev/ixl/ixl_pf_main.c Mon Aug 8 18:57:50 2016
(r303847)
@@ -1155,6 +1155,10 @@ ixl_setup_queue_tqs(struct ixl_vsi *vsi)
{
struct ixl_queue *que = vsi->queues;
device_t dev = vsi->dev;
+#ifdef RSS
+ int cpu_id = 0;
+ cpuset_t cpu_mask;
+#endif
/* Create queue tasks and start queue taskqueues */
for (int i = 0; i < vsi->num_queues; i++, que++) {
@@ -1246,9 +1250,6 @@ ixl_setup_queue_msix(struct ixl_vsi *vsi
struct ixl_queue *que = vsi->queues;
struct tx_ring *txr;
int error, rid, vector = 1;
-#ifdef RSS
- cpuset_t cpu_mask;
-#endif
/* Queue interrupt vector numbers start at 1 (adminq intr is 0) */
for (int i = 0; i < vsi->num_queues; i++, vector++, que++) {
Modified: head/sys/dev/ixl/ixlvc.c
==============================================================================
--- head/sys/dev/ixl/ixlvc.c Mon Aug 8 18:31:28 2016 (r303846)
+++ head/sys/dev/ixl/ixlvc.c Mon Aug 8 18:57:50 2016 (r303847)
@@ -836,13 +836,10 @@ ixlv_config_rss_key(struct ixlv_sc *sc)
struct i40e_virtchnl_rss_key *rss_key_msg;
int msg_len, key_length;
u8 rss_seed[IXL_RSS_KEY_SIZE];
-#ifdef RSS
- u32 rss_hash_config;
-#endif
#ifdef RSS
/* Fetch the configured RSS key */
- rss_getkey(&rss_seed);
+ rss_getkey((uint8_t *) &rss_seed);
#else
ixl_get_default_rss_key((u32 *)rss_seed);
#endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
