From owner-svn-src-head@freebsd.org Wed Jan 11 19:29:34 2017 Return-Path: Delivered-To: svn-src-head@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 C18CECAAE5F; Wed, 11 Jan 2017 19:29:34 +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 78BED1C6D; Wed, 11 Jan 2017 19:29:34 +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 v0BJTXFg030282; Wed, 11 Jan 2017 19:29:33 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BJTX4m030279; Wed, 11 Jan 2017 19:29:33 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201701111929.v0BJTX4m030279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Wed, 11 Jan 2017 19:29:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311931 - head/sys/dev/e1000 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.23 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: Wed, 11 Jan 2017 19:29:34 -0000 Author: sbruno Date: Wed Jan 11 19:29:33 2017 New Revision: 311931 URL: https://svnweb.freebsd.org/changeset/base/311931 Log: Restore v6 offload caps for igb(4) class devices. Reported by: tuxen Modified: head/sys/dev/e1000/em_txrx.c head/sys/dev/e1000/if_em.h head/sys/dev/e1000/igb_txrx.c Modified: head/sys/dev/e1000/em_txrx.c ============================================================================== --- head/sys/dev/e1000/em_txrx.c Wed Jan 11 19:29:28 2017 (r311930) +++ head/sys/dev/e1000/em_txrx.c Wed Jan 11 19:29:33 2017 (r311931) @@ -304,7 +304,7 @@ em_isc_txd_encap(void *arg, if_pkt_info_ if (do_tso) { i = em_tso_setup(sc, pi, &txd_upper, &txd_lower); tso_desc = TRUE; - } else if (csum_flags & CSUM_OFFLOAD) { + } else if (csum_flags & EM_CSUM_OFFLOAD) { i = em_transmit_checksum_setup(sc, pi, &txd_upper, &txd_lower); } Modified: head/sys/dev/e1000/if_em.h ============================================================================== --- head/sys/dev/e1000/if_em.h Wed Jan 11 19:29:28 2017 (r311930) +++ head/sys/dev/e1000/if_em.h Wed Jan 11 19:29:33 2017 (r311931) @@ -330,7 +330,8 @@ #define EM_MSIX_LINK 0x01000000 /* For 82574 use */ #define ETH_ZLEN 60 #define ETH_ADDR_LEN 6 -#define CSUM_OFFLOAD 7 /* Offload bits in mbuf flag */ +#define EM_CSUM_OFFLOAD 7 /* Offload bits in mbuf flag */ +#define IGB_CSUM_OFFLOAD 0x0E0F /* Offload bits in mbuf flag */ #define IGB_PKTTYPE_MASK 0x0000FFF0 #define IGB_DMCTLX_DCFLUSH_DIS 0x80000000 /* Disable DMA Coalesce Flush */ Modified: head/sys/dev/e1000/igb_txrx.c ============================================================================== --- head/sys/dev/e1000/igb_txrx.c Wed Jan 11 19:29:28 2017 (r311930) +++ head/sys/dev/e1000/igb_txrx.c Wed Jan 11 19:29:33 2017 (r311931) @@ -171,7 +171,7 @@ igb_tx_ctx_setup(struct tx_ring *txr, if */ if (pi->ipi_mflags & M_VLANTAG) { vlan_macip_lens |= (pi->ipi_vtag << E1000_ADVTXD_VLAN_SHIFT); - } else if ((pi->ipi_csum_flags & CSUM_OFFLOAD) == 0) { + } else if ((pi->ipi_csum_flags & IGB_CSUM_OFFLOAD) == 0) { return (0); }