diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index 4c6b8b837205..bfb708a709f5 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -36,6 +36,10 @@ #ifndef _IXL_H_ #define _IXL_H_ +#include "opt_inet.h" +#include "opt_inet6.h" +#include "opt_rss.h" + #include #include #include @@ -93,12 +97,9 @@ #ifdef RSS #include +#include #endif -#include "opt_inet.h" -#include "opt_inet6.h" -#include "opt_rss.h" - #include "i40e_type.h" #include "i40e_prototype.h" diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index fabc8b7bfbc2..d8da4cfee106 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -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++) { diff --git a/sys/dev/ixl/ixlvc.c b/sys/dev/ixl/ixlvc.c index 155f0ab46ae6..7b041c18a8d7 100644 --- a/sys/dev/ixl/ixlvc.c +++ b/sys/dev/ixl/ixlvc.c @@ -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