From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 16:42:42 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 511931065680; Tue, 24 Feb 2009 16:42:42 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3FD638FC2A; Tue, 24 Feb 2009 16:42:42 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OGggDm070577; Tue, 24 Feb 2009 16:42:42 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OGggBO070576; Tue, 24 Feb 2009 16:42:42 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902241642.n1OGggBO070576@svn.freebsd.org> From: Doug Rabson Date: Tue, 24 Feb 2009 16:42:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188999 - user/dfr/xenhvm/6/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 16:42:42 -0000 Author: dfr Date: Tue Feb 24 16:42:41 2009 New Revision: 188999 URL: http://svn.freebsd.org/changeset/base/188999 Log: Fix build. Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:39:58 2009 (r188998) +++ user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:42:41 2009 (r188999) @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE) #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE) +#if __FreeBSD_version >= 700000 /* * Should the driver do LRO on the RX end * this can be toggled on the fly, but the @@ -96,6 +97,12 @@ __FBSDID("$FreeBSD$"); */ static int xn_enable_lro = 1; TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro); +#else + +#define IFCAP_TSO4 0 +#define CSUM_TSO 0 + +#endif #ifdef CONFIG_XEN static int MODPARM_rx_copy = 0; @@ -416,10 +423,12 @@ netfront_attach(device_t dev) return err; } +#if __FreeBSD_version >= 700000 SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, &xn_enable_lro, 0, "Large Receive Offload"); +#endif return 0; }