[src/trunk]: src/sys/netinet Fixed initialization

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

details:   https://anonhg.NetBSD.org/src/rev/2bd11a1693e0
branches:  trunk
changeset: 521145:2bd11a1693e0
user:      martti <martti%NetBSD.org@localhost>
date:      Thu Jan 24 08:24:59 2002 +0000

description:
Fixed initialization

diffstat:

 sys/netinet/ip_fil.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 9c9ef490792f -r 2bd11a1693e0 sys/netinet/ip_fil.c
--- a/sys/netinet/ip_fil.c      Thu Jan 24 08:24:38 2002 +0000
+++ b/sys/netinet/ip_fil.c      Thu Jan 24 08:24:59 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.c,v 1.74 2002/01/24 08:23:41 martti Exp $       */
+/*     $NetBSD: ip_fil.c,v 1.75 2002/01/24 08:24:59 martti Exp $       */
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -120,7 +120,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil.c,v 1.74 2002/01/24 08:23:41 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil.c,v 1.75 2002/01/24 08:24:59 martti 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.c,v 2.42.2.48 2002/01/01 13:34:05 darrenr Exp";
@@ -367,12 +367,15 @@
 # ifdef NETBSD_PF
 #  if __NetBSD_Version__ >= 104200000
 #   if __NetBSD_Version__ >= 105110000
-       if (
-           !(ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET))
+       ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
 #    ifdef USE_INET6
-           && !(ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6))
+       ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
 #    endif
-          )
+       if (ph_inet == NULL
+#    ifdef USE_INET6
+           && ph_inet6 == NULL
+#    endif
+           )
                return ENODEV;
 
        if (ph_inet != NULL)
@@ -402,7 +405,7 @@
 #   if __NetBSD_Version__ >= 105110000
        if (ph_inet6 != NULL)
                error = pfil_add_hook((void *)fr_check_wrapper6, NULL,
-                                     PFIL_IN|PFIL_OUT, ph_inet);
+                                     PFIL_IN|PFIL_OUT, ph_inet6);
        else
                error = 0;
        if (error) {