From owner-svn-src-head@FreeBSD.ORG Tue Mar 17 22:40:52 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9ED0DEEF; Tue, 17 Mar 2015 22:40:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7FCB5A63; Tue, 17 Mar 2015 22:40:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2HMeqa9058993; Tue, 17 Mar 2015 22:40:52 GMT (envelope-from jfv@FreeBSD.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2HMepgD058989; Tue, 17 Mar 2015 22:40:51 GMT (envelope-from jfv@FreeBSD.org) Message-Id: <201503172240.t2HMepgD058989@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org using -f From: Jack F Vogel Date: Tue, 17 Mar 2015 22:40:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280197 - in head/sys: dev/ixgbe modules X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2015 22:40:52 -0000 Author: jfv Date: Tue Mar 17 22:40:50 2015 New Revision: 280197 URL: https://svnweb.freebsd.org/changeset/base/280197 Log: Resolve a few build issues, add module directories back into Makefile, then correct a NETMAP problem resulting from the split, and finally temporarily disable the X550 functionality. Modified: head/sys/dev/ixgbe/if_ixv.c head/sys/dev/ixgbe/ix_txrx.c head/sys/dev/ixgbe/ixgbe_api.c head/sys/modules/Makefile Modified: head/sys/dev/ixgbe/if_ixv.c ============================================================================== --- head/sys/dev/ixgbe/if_ixv.c Tue Mar 17 22:00:11 2015 (r280196) +++ head/sys/dev/ixgbe/if_ixv.c Tue Mar 17 22:40:50 2015 (r280197) @@ -285,7 +285,7 @@ ixv_attach(device_t dev) SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "enable_aim", CTLTYPE_INT|CTLFLAG_RW, + OID_AUTO, "enable_aim", CTLFLAG_RW, &ixv_enable_aim, 1, "Interrupt Moderation"); /* Set up the timer callout */ Modified: head/sys/dev/ixgbe/ix_txrx.c ============================================================================== --- head/sys/dev/ixgbe/ix_txrx.c Tue Mar 17 22:00:11 2015 (r280196) +++ head/sys/dev/ixgbe/ix_txrx.c Tue Mar 17 22:40:50 2015 (r280197) @@ -45,6 +45,12 @@ #include #endif +#ifdef DEV_NETMAP +#include +#include +#include +#endif + /* ** HW RSC control: ** this feature only works with @@ -1233,6 +1239,7 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr) rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL); rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE; #ifdef DEV_NETMAP /* crcstrip is optional in netmap */ + extern int ix_crcstrip; if (adapter->ifp->if_capenable & IFCAP_NETMAP && !ix_crcstrip) #endif /* DEV_NETMAP */ rdrxctl |= IXGBE_RDRXCTL_CRCSTRIP; Modified: head/sys/dev/ixgbe/ixgbe_api.c ============================================================================== --- head/sys/dev/ixgbe/ixgbe_api.c Tue Mar 17 22:00:11 2015 (r280196) +++ head/sys/dev/ixgbe/ixgbe_api.c Tue Mar 17 22:40:50 2015 (r280197) @@ -81,6 +81,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_ case ixgbe_mac_X540: status = ixgbe_init_ops_X540(hw); break; +#if 0 //JFV temporary disable case ixgbe_mac_X550: status = ixgbe_init_ops_X550(hw); break; @@ -88,6 +89,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_ case ixgbe_mac_X550EM_a: status = ixgbe_init_ops_X550EM(hw); break; +#endif case ixgbe_mac_82599_vf: case ixgbe_mac_X540_vf: case ixgbe_mac_X550_vf: Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Tue Mar 17 22:00:11 2015 (r280196) +++ head/sys/modules/Makefile Tue Mar 17 22:40:50 2015 (r280197) @@ -175,6 +175,8 @@ SUBDIR= \ ${_iwn} \ ${_iwnfw} \ ${_ixgb} \ + ${_ix} \ + ${_ixv} \ ${_ixl} \ ${_ixlv} \ jme \