From 1d2092adf5e1706c65250254e9ab87d012628038 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 11 Dec 2018 01:49:06 +0000 Subject: [PATCH] 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. --- contrib/ipfilter/ip_fil.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/contrib/ipfilter/ip_fil.c b/contrib/ipfilter/ip_fil.c index f16c4fb8a1e..32cba4cdd37 100644 --- a/contrib/ipfilter/ip_fil.c +++ b/contrib/ipfilter/ip_fil.c @@ -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; -- 2.45.0