From owner-svn-src-all@freebsd.org Mon Aug 8 18:57:52 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6340ABB3381; Mon, 8 Aug 2016 18:57:52 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19AD0128B; Mon, 8 Aug 2016 18:57:52 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u78Ivpq9014526; Mon, 8 Aug 2016 18:57:51 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u78IvpcX014523; Mon, 8 Aug 2016 18:57:51 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201608081857.u78IvpcX014523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 8 Aug 2016 18:57:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303847 - head/sys/dev/ixl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2016 18:57:52 -0000 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 #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" 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