[src/trunk]: src/sys/external/bsd/ipf/netinet Call the right filter function ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/773889670750
branches:  trunk
changeset: 823872:773889670750
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 12 08:03:26 2017 +0000

description:
Call the right filter function for hook removal found by Stephen Borrill.

diffstat:

 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 559119e5c50e -r 773889670750 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
--- a/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Fri May 12 07:26:35 2017 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Fri May 12 08:03:26 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil_netbsd.c,v 1.22 2017/02/14 03:05:06 ozaki-r Exp $       */
+/*     $NetBSD: ip_fil_netbsd.c,v 1.23 2017/05/12 08:03:26 christos Exp $      */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.22 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.23 2017/05/12 08:03:26 christos Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -582,8 +582,13 @@
 # if (__NetBSD_Version__ >= 104200000)
 #  if __NetBSD_Version__ >= 105110000
 #   if defined(PFIL_TYPE_IFNET) && defined(PFIL_IFNET)
+#    if __NetBSD_Version__ >= 799000400
+       (void) pfil_remove_ihook((void *)ipf_pfilsync, NULL,
+                               PFIL_IFNET, ph_ifsync);
+#    else
        (void) pfil_remove_hook((void *)ipf_pfilsync, NULL,
                                PFIL_IFNET, ph_ifsync);
+#    endif
 #   endif
 
        if (ph_inet != NULL)