Module Name: src
Committed By: oster
Date: Sat Dec 9 20:31:57 UTC 2023
Modified Files:
src/sys/compat/common: compat_90_mod.c net_inet6_nd_90.c
Log Message:
Allow kernels builds which don't define INET6 to compile compat bits too.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/compat_90_mod.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/net_inet6_nd_90.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/compat_90_mod.c
diff -u src/sys/compat/common/compat_90_mod.c:1.5 src/sys/compat/common/compat_90_mod.c:1.6
--- src/sys/compat/common/compat_90_mod.c:1.5 Sat Dec 9 15:21:01 2023
+++ src/sys/compat/common/compat_90_mod.c Sat Dec 9 20:31:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_90_mod.c,v 1.5 2023/12/09 15:21:01 pgoyette Exp $ */
+/* $NetBSD: compat_90_mod.c,v 1.6 2023/12/09 20:31:57 oster Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_90_mod.c,v 1.5 2023/12/09 15:21:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_90_mod.c,v 1.6 2023/12/09 20:31:57 oster Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -50,7 +50,9 @@ int
compat_90_init(void)
{
+#ifdef INET6
net_inet6_nd_90_init();
+#endif
return vfs_syscalls_90_init();
}
@@ -63,7 +65,9 @@ compat_90_fini(void)
if (error != 0)
return error;
+#ifdef INET6
net_inet6_nd_90_fini();
+#endif
return error;
}
Index: src/sys/compat/common/net_inet6_nd_90.c
diff -u src/sys/compat/common/net_inet6_nd_90.c:1.1 src/sys/compat/common/net_inet6_nd_90.c:1.2
--- src/sys/compat/common/net_inet6_nd_90.c:1.1 Sat Dec 9 15:21:01 2023
+++ src/sys/compat/common/net_inet6_nd_90.c Sat Dec 9 20:31:57 2023
@@ -1,6 +1,6 @@
-/* $NetBSD: net_inet6_nd_90.c,v 1.1 2023/12/09 15:21:01 pgoyette Exp $ */
+/* $NetBSD: net_inet6_nd_90.c,v 1.2 2023/12/09 20:31:57 oster Exp $ */
-/* $NetBSD: net_inet6_nd_90.c,v 1.1 2023/12/09 15:21:01 pgoyette Exp $ */
+/* $NetBSD: net_inet6_nd_90.c,v 1.2 2023/12/09 20:31:57 oster Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_inet6_nd_90.c,v 1.1 2023/12/09 15:21:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_inet6_nd_90.c,v 1.2 2023/12/09 20:31:57 oster Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: net_inet6_nd
#include <compat/common/compat_mod.h>
+#ifdef INET6
+
static struct sysctllog *nd6_clog;
/*
@@ -128,3 +130,6 @@ net_inet6_nd_90_fini(void)
MODULE_HOOK_UNSET(net_inet6_nd_90_hook);
return 0;
}
+
+#endif /* INET6 */
+
