Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jul 2019 19:00:42 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r350064 - head/sys/contrib/ipfilter/netinet
Message-ID:  <201907161900.x6GJ0gsS027689@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Tue Jul 16 19:00:42 2019
New Revision: 350064
URL: https://svnweb.freebsd.org/changeset/base/350064

Log:
  As of upstream fil.c CVS r1.53 (March 1, 2009), prior to the import of
  ipfilter 5.1.2 into FreeBSD-10, the fix for, 2580062 from/to targets
  should be able to use any interface name, moved frentry.fr_cksum to
  prior to frentry.fr_func thereby making this code redundant. After
  investigating whether this fix to move fr_cksum was correct and if it
  broke anything, it has been determined that the fix is correct and this
  code is redundant. We remove it here.
  
  MFC after:	2 weeks

Modified:
  head/sys/contrib/ipfilter/netinet/fil.c

Modified: head/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/fil.c	Tue Jul 16 19:00:38 2019	(r350063)
+++ head/sys/contrib/ipfilter/netinet/fil.c	Tue Jul 16 19:00:42 2019	(r350064)
@@ -4922,9 +4922,6 @@ frrequest(softc, unit, req, data, set, makecopy)
 	 * the constant part of the filter rule to make comparisons quicker
 	 * (this meaning no pointers are included).
 	 */
-	for (fp->fr_cksum = 0, p = (u_int *)&fp->fr_func, pp = &fp->fr_cksum;
-	     p < pp; p++)
-		fp->fr_cksum += *p;
 	pp = (u_int *)(fp->fr_caddr + fp->fr_dsize);
 	for (p = (u_int *)fp->fr_data; p < pp; p++)
 		fp->fr_cksum += *p;



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