Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Nov 2012 15:19:55 +0000 (UTC)
From:      Andre Oppermann <andre@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r243338 - user/andre/tcp_workqueue/sys/contrib/ipfilter/netinet
Message-ID:  <201211201519.qAKFJt0J044503@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 +



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211201519.qAKFJt0J044503>