From owner-svn-src-user@FreeBSD.ORG  Tue Jun 29 10:21:34 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 9E3F2106564A;
	Tue, 29 Jun 2010 10:21:34 +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 8E9118FC19;
	Tue, 29 Jun 2010 10:21:34 +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 o5TALYOo092901;
	Tue, 29 Jun 2010 10:21:34 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5TALYPl092899;
	Tue, 29 Jun 2010 10:21:34 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201006291021.o5TALYPl092899@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 29 Jun 2010 10:21:34 +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: r209586 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 10:21:34 -0000

Author: jmallett
Date: Tue Jun 29 10:21:34 2010
New Revision: 209586
URL: http://svn.freebsd.org/changeset/base/209586

Log:
  Check RXCSUM before setting checksum-valid flags on a packet.  Probably not
  very useful, but why not?

Modified:
  user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c	Tue Jun 29 10:13:32 2010	(r209585)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-rx.c	Tue Jun 29 10:21:34 2010	(r209586)
@@ -317,11 +317,15 @@ void cvm_oct_tasklet_rx(void *context, i
 			if ((ifp->if_flags & IFF_UP)) {
 				m->m_pkthdr.rcvif = ifp;
 
-				if ((work->word2.s.not_IP || work->word2.s.IP_exc || work->word2.s.L4_error))
+				if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+					if ((work->word2.s.not_IP || work->word2.s.IP_exc || work->word2.s.L4_error))
+						m->m_pkthdr.csum_flags = 0; /* XXX */
+					else {
+						m->m_pkthdr.csum_flags = CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
+						m->m_pkthdr.csum_data = 0xffff;
+					}
+				} else {
 					m->m_pkthdr.csum_flags = 0; /* XXX */
-				else {
-					m->m_pkthdr.csum_flags = CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
-					m->m_pkthdr.csum_data = 0xffff;
 				}
 
 				ifp->if_ipackets++;