From owner-svn-src-all@FreeBSD.ORG Fri Aug 29 00:33:32 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FA709C7; Fri, 29 Aug 2014 00:33:32 +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 E35EE18BD; Fri, 29 Aug 2014 00:33:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T0XVxl091766; Fri, 29 Aug 2014 00:33:31 GMT (envelope-from jfv@FreeBSD.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T0XV1l091765; Fri, 29 Aug 2014 00:33:31 GMT (envelope-from jfv@FreeBSD.org) Message-Id: <201408290033.s7T0XV1l091765@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org using -f From: Jack F Vogel Date: Fri, 29 Aug 2014 00:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270775 - 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.18-1 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: Fri, 29 Aug 2014 00:33:32 -0000 Author: jfv Date: Fri Aug 29 00:33:31 2014 New Revision: 270775 URL: http://svnweb.freebsd.org/changeset/base/270775 Log: Fix the NOINET and NOINET6 builds. MFC after:3 days Modified: head/sys/dev/ixl/ixl_txrx.c Modified: head/sys/dev/ixl/ixl_txrx.c ============================================================================== --- head/sys/dev/ixl/ixl_txrx.c Thu Aug 28 23:32:56 2014 (r270774) +++ head/sys/dev/ixl/ixl_txrx.c Fri Aug 29 00:33:31 2014 (r270775) @@ -596,6 +596,7 @@ ixl_tx_setup_offload(struct ixl_queue *q switch (etype) { case ETHERTYPE_IP: +#ifdef INET ip = (struct ip *)(mp->m_data + elen); ip_hlen = ip->ip_hl << 2; ipproto = ip->ip_p; @@ -605,14 +606,17 @@ ixl_tx_setup_offload(struct ixl_queue *q *cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM; else *cmd |= I40E_TX_DESC_CMD_IIPT_IPV4; +#endif break; case ETHERTYPE_IPV6: +#ifdef INET6 ip6 = (struct ip6_hdr *)(mp->m_data + elen); ip_hlen = sizeof(struct ip6_hdr); ipproto = ip6->ip6_nxt; th = (struct tcphdr *)((caddr_t)ip6 + ip_hlen); *cmd |= I40E_TX_DESC_CMD_IIPT_IPV6; /* Falls thru */ +#endif default: break; }