svn commit: r341804 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter

[Cy Schubert]

Author: cy
Date: Tue Dec 11 01:49:06 2018
New Revision: 341804
URL: https://svnweb.freebsd.org/changeset/base/341804

Log:
  As part of the general cleanup of the ipfilter code, special cases
  are committed separately to document fixing them separately from
  the general cleanup. In this case we don't want to hide the utter
  brokenness of what is being fixed.
  
  Clean up a discombobulated block of #if's, with one block unreachable.
  ip_fil.c is used in ipftest which is used to dry-run test ipfilter
  rules in userspace without loading them in the kernel. The call to
  (*ifp->if_output) matches that in the FreeBSD kernel.
  
  Further testing and work will be required to make ipftest fully
  functional.

Modified:
  stable/11/contrib/ipfilter/ip_fil.c
Directory Properties:
  stable/11/   (props changed)

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

Modified: stable/11/contrib/ipfilter/ip_fil.c
==============================================================================
--- stable/11/contrib/ipfilter/ip_fil.c	Tue Dec 11 01:38:50 2018	(r341803)
+++ stable/11/contrib/ipfilter/ip_fil.c	Tue Dec 11 01:49:06 2018	(r341804)
@@ -482,14 +482,7 @@ ipf_fastroute(m, mpp, fin, fdp)
 	m->mb_ifp = ifp;
 	printpacket(fin->fin_out, m);
 
-#if defined(__sgi) && (IRIX < 60500)
-	(*ifp->if_output)(ifp, (void *)ip, NULL);
-# if TRU64 >= 1885
-	(*ifp->if_output)(ifp, (void *)m, NULL, 0, 0);
-# else
 	(*ifp->if_output)(ifp, (void *)m, NULL, 0);
-# endif
-#endif
 done:
 	fin->fin_ifp = sifp;
 	fin->fin_out = sout;