[src/trunk]: src/sys/dist/pf/net Update pf to pfil(9) changes. Missed in pre...

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

details:   https://anonhg.NetBSD.org/src/rev/98cc951debbd
branches:  trunk
changeset: 787738:98cc951debbd
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jun 30 14:58:48 2013 +0000

description:
Update pf to pfil(9) changes.  Missed in previous commit.

diffstat:

 sys/dist/pf/net/pf_if.c    |   8 ++++----
 sys/dist/pf/net/pf_ioctl.c |  20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (101 lines):

diff -r 7245e5fbc041 -r 98cc951debbd sys/dist/pf/net/pf_if.c
--- a/sys/dist/pf/net/pf_if.c   Sun Jun 30 12:20:32 2013 +0000
+++ b/sys/dist/pf/net/pf_if.c   Sun Jun 30 14:58:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf_if.c,v 1.21 2010/04/12 13:57:38 ahoka Exp $ */
+/*     $NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $ */
 /*     $OpenBSD: pf_if.c,v 1.47 2007/07/13 09:17:48 markus Exp $ */
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.21 2010/04/12 13:57:38 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_if.c,v 1.22 2013/06/30 14:58:48 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -133,8 +133,8 @@
                }
        }
 
-       pfil_add_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, &if_pfil);
-       pfil_add_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, &if_pfil);
+       pfil_add_hook(pfil_ifnet_wrapper, NULL, PFIL_IFNET, if_pfil);
+       pfil_add_hook(pfil_ifaddr_wrapper, NULL, PFIL_IFADDR, if_pfil);
 #endif /* __NetBSD__ */
 }
 
diff -r 7245e5fbc041 -r 98cc951debbd sys/dist/pf/net/pf_ioctl.c
--- a/sys/dist/pf/net/pf_ioctl.c        Sun Jun 30 12:20:32 2013 +0000
+++ b/sys/dist/pf/net/pf_ioctl.c        Sun Jun 30 14:58:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf_ioctl.c,v 1.46 2011/11/28 08:05:05 tls Exp $        */
+/*     $NetBSD: pf_ioctl.c,v 1.47 2013/06/30 14:58:48 rmind Exp $      */
 /*     $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.46 2011/11/28 08:05:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.47 2013/06/30 14:58:48 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3327,16 +3327,16 @@
 static int
 pf_pfil_attach(void)
 {
-       struct pfil_head *ph_inet;
+       pfil_head_t *ph_inet;
 #ifdef INET6
-       struct pfil_head *ph_inet6;
+       pfil_head_t *ph_inet6;
 #endif /* INET6 */
        int error;
 
        if (pf_pfil_attached)
                return (EBUSY);
 
-       ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
+       ph_inet = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET);
        if (ph_inet)
                error = pfil_add_hook((void *)pfil4_wrapper, NULL,
                    PFIL_IN|PFIL_OUT, ph_inet);
@@ -3346,7 +3346,7 @@
                return (error);
 
 #ifdef INET6
-       ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
+       ph_inet6 = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET6);
        if (ph_inet6)
                error = pfil_add_hook((void *)pfil6_wrapper, NULL,
                    PFIL_IN|PFIL_OUT, ph_inet6);
@@ -3371,20 +3371,20 @@
 static int
 pf_pfil_detach(void)
 {
-       struct pfil_head *ph_inet;
+       pfil_head_t *ph_inet;
 #ifdef INET6
-       struct pfil_head *ph_inet6;
+       pfil_head_t *ph_inet6;
 #endif /* INET6 */
 
        if (pf_pfil_attached == 0)
                return (EBUSY);
 
-       ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
+       ph_inet = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET);
        if (ph_inet)
                pfil_remove_hook((void *)pfil4_wrapper, NULL,
                    PFIL_IN|PFIL_OUT, ph_inet);
 #ifdef INET6
-       ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
+       ph_inet6 = pfil_head_get(PFIL_TYPE_AF, (void *)AF_INET6);
        if (ph_inet6)
                pfil_remove_hook((void *)pfil6_wrapper, NULL,
                    PFIL_IN|PFIL_OUT, ph_inet6);