From owner-svn-src-user@FreeBSD.ORG  Tue Nov 20 15:19:56 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F016C7CF;
 Tue, 20 Nov 2012 15:19:55 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D195E8FC13;
 Tue, 20 Nov 2012 15:19:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAKFJt8H044504;
 Tue, 20 Nov 2012 15:19:55 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAKFJt0J044503;
 Tue, 20 Nov 2012 15:19:55 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201211201519.qAKFJt0J044503@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Tue, 20 Nov 2012 15:19:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r243338 -
 user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 20 Nov 2012 15:19:56 -0000

Author: andre
Date: Tue Nov 20 15:19:55 2012
New Revision: 243338
URL: http://svnweb.freebsd.org/changeset/base/243338

Log:
  Adjust IPFILTER to the updated checksum definitions.

Modified:
  user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c

Modified: user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Tue Nov 20 14:11:27 2012	(r243337)
+++ user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Tue Nov 20 15:19:55 2012	(r243338)
@@ -1332,7 +1332,7 @@ fr_info_t *fin;
 INLINE void fr_checkv4sum(fin)
 fr_info_t *fin;
 {
-#ifdef CSUM_DATA_VALID
+#ifdef CSUM_L4_VALID
 	int manual = 0;
 	u_short sum;
 	ip_t *ip;
@@ -1351,9 +1351,9 @@ fr_info_t *fin;
 	}
 	ip = fin->fin_ip;
 
-	if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
-		if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
-			sum = m->m_pkthdr.csum_data;
+	if (m->m_pkthdr.csum_flags & CSUM_L4_CALC) {
+		if (m->m_pkthdr.csum_flags & CSUM_L4_VALID)
+			sum = 0xffff;
 		else
 			sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr,
 					htonl(m->m_pkthdr.csum_data +