[src/trunk]: src/sys/netinet make this build without INET6.

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

details:   https://anonhg.NetBSD.org/src/rev/f8ba8b6e1d33
branches:  trunk
changeset: 769875:f8ba8b6e1d33
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Sep 25 11:54:28 2011 +0000

description:
make this build without INET6.
also, fix the rfc6056algo passed to sysctl_rfc6056_helper
(it was backwards for inet4/inet6.)

diffstat:

 sys/netinet/rfc6056.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 12641445cde9 -r f8ba8b6e1d33 sys/netinet/rfc6056.c
--- a/sys/netinet/rfc6056.c     Sun Sep 25 11:20:41 2011 +0000
+++ b/sys/netinet/rfc6056.c     Sun Sep 25 11:54:28 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rfc6056.c,v 1.2 2011/09/24 18:32:23 christos Exp $     */
+/*     $NetBSD: rfc6056.c,v 1.3 2011/09/25 11:54:28 mrg Exp $  */
 
 /*
  * Copyright 2011 Vlad Balan
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfc6056.c,v 1.2 2011/09/24 18:32:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfc6056.c,v 1.3 2011/09/25 11:54:28 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -231,12 +231,14 @@
 kauth_cred_t cred)
 {
        struct inpcbtable *table;
-       struct socket *so;
 #ifdef INET
        vestigial_inpcb_t vestigial;
 #endif
        int error;
+#ifdef INET6
+       struct socket *so;
        int wild = 0;
+#endif
 
        DPRINTF("%s called for argument %d\n", __func__, port);
 
@@ -567,7 +569,9 @@
 static bool
 iscompletetuple(struct inpcb_hdr *inp_hdr)
 {
+#ifdef INET6
        struct in6pcb *in6p;
+#endif
 
        switch (inp_hdr->inph_af) {
 #ifdef INET
@@ -910,14 +914,16 @@
 int
 sysctl_rfc6056_selected(SYSCTLFN_ARGS)
 {
-       return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), &inet6_rfc6056algo);
+       return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), &inet4_rfc6056algo);
 }
 
+#ifdef INET6
 int
 sysctl_rfc6056_selected6(SYSCTLFN_ARGS)
 {
-       return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), &inet4_rfc6056algo);
+       return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), &inet6_rfc6056algo);
 }
+#endif
 
 /*
  * The sysctl hook that returns the available