svn commit: r350434 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Tue Jul 30 03:32:39 2019
New Revision: 350434
URL: https://svnweb.freebsd.org/changeset/base/350434

Log:
  MFC r350064:
  
  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.

Modified:
  stable/11/sys/contrib/ipfilter/netinet/fil.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/contrib/ipfilter/netinet/fil.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/fil.c	Tue Jul 30 02:01:49 2019	(r350433)
+++ stable/11/sys/contrib/ipfilter/netinet/fil.c	Tue Jul 30 03:32:39 2019	(r350434)
@@ -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;