[src/trunk]: src/sys/dist/ipf/netinet PR kern/45907

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

details:   https://anonhg.NetBSD.org/src/rev/2a6911749d48
branches:  trunk
changeset: 773409:2a6911749d48
user:      darrenr <darrenr%NetBSD.org@localhost>
date:      Wed Feb 01 17:11:46 2012 +0000

description:
PR kern/45907
#ifdef USE_INET6 guards are missing around IPv6 code

diffstat:

 sys/dist/ipf/netinet/fil.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 191a3a0de29a -r 2a6911749d48 sys/dist/ipf/netinet/fil.c
--- a/sys/dist/ipf/netinet/fil.c        Wed Feb 01 16:56:34 2012 +0000
+++ b/sys/dist/ipf/netinet/fil.c        Wed Feb 01 17:11:46 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.51 2012/02/01 16:46:28 christos Exp $        */
+/*     $NetBSD: fil.c,v 1.52 2012/02/01 17:11:46 darrenr Exp $ */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.51 2012/02/01 16:46:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.52 2012/02/01 17:11:46 darrenr Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 2.443.2.36 2012/01/29 05:30:35 darrenr Exp";
@@ -9369,6 +9369,7 @@
                        mask = htonl(0xffffffff << (32 - bits));
                }
                key->hn_addr.adf_addr.in4.s_addr = addr->in4.s_addr & mask;
+#ifdef USE_INET6
        } else {
                int bits = htp->ht_netmask;
 
@@ -9398,6 +9399,7 @@
                        key->hn_addr.adf_addr.i6[0] = addr->i6[0] &
                                             htonl(0xffffffff << (32 - bits));
                }
+#endif
        }
 }