From owner-svn-src-user@FreeBSD.ORG Sat Jun 26 07:59:57 2010 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 6E26C106564A; Sat, 26 Jun 2010 07:59:57 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CFFB8FC18; Sat, 26 Jun 2010 07:59:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5Q7xv4C069754; Sat, 26 Jun 2010 07:59:57 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5Q7xvtG069751; Sat, 26 Jun 2010 07:59:57 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006260759.o5Q7xvtG069751@svn.freebsd.org> From: Juli Mallett Date: Sat, 26 Jun 2010 07:59:57 +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: r209534 - user/jmallett/octeon/sys/mips/cavium/octe 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: Sat, 26 Jun 2010 07:59:57 -0000 Author: jmallett Date: Sat Jun 26 07:59:57 2010 New Revision: 209534 URL: http://svn.freebsd.org/changeset/base/209534 Log: Don't try to use VLAN hw tagging, it doesn't seem to work as I'd hoped. Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c user/jmallett/octeon/sys/mips/cavium/octe/octe.c Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c Sat Jun 26 07:42:33 2010 (r209533) +++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c Sat Jun 26 07:59:57 2010 (r209534) @@ -326,11 +326,6 @@ void cvm_oct_tasklet_rx(void *context, i m->m_pkthdr.csum_data = 0xffff; } - if (work->word2.s.vlan_valid) { - m->m_pkthdr.ether_vtag = work->word2.s.vlan_id; - m->m_flags |= M_VLANTAG; - } - if (priv->intercept_cb) { callback_result = priv->intercept_cb(ifp, work, m); Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/octe.c Sat Jun 26 07:42:33 2010 (r209533) +++ user/jmallett/octeon/sys/mips/cavium/octe/octe.c Sat Jun 26 07:59:57 2010 (r209534) @@ -192,7 +192,7 @@ octe_attach(device_t dev) ether_ifattach(ifp, priv->mac); ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); - ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | IFCAP_HWCSUM; + ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_HWCSUM; ifp->if_capenable = ifp->if_capabilities; ifp->if_hwassist = CSUM_TCP | CSUM_UDP;