Module Name: src
Committed By: pooka
Date: Wed May 27 23:44:36 UTC 2009
Modified Files:
src/sys/kern: init_main.c uipc_domain.c
src/sys/sys: domain.h
Log Message:
Make domaininit() take an argument which determines if it should
add the special PF_ROUTE domain or not (if available).
To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 src/sys/kern/init_main.c
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.27 -r1.28 src/sys/sys/domain.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.389 src/sys/kern/init_main.c:1.390
--- src/sys/kern/init_main.c:1.389 Sun Apr 19 14:04:51 2009
+++ src/sys/kern/init_main.c Wed May 27 23:44:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.389 2009/04/19 14:04:51 ad Exp $ */
+/* $NetBSD: init_main.c,v 1.390 2009/05/27 23:44:36 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.389 2009/04/19 14:04:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.390 2009/05/27 23:44:36 pooka Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -518,7 +518,7 @@
*/
s = splnet();
ifinit();
- domaininit();
+ domaininit(true);
if_attachdomain();
splx(s);
Index: src/sys/kern/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.81 src/sys/kern/uipc_domain.c:1.82
--- src/sys/kern/uipc_domain.c:1.81 Tue Apr 28 20:56:40 2009
+++ src/sys/kern/uipc_domain.c Wed May 27 23:44:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_domain.c,v 1.81 2009/04/28 20:56:40 dyoung Exp $ */
+/* $NetBSD: uipc_domain.c,v 1.82 2009/05/27 23:44:36 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.81 2009/04/28 20:56:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.82 2009/05/27 23:44:36 pooka Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -77,7 +77,7 @@
static void sysctl_net_setup(void);
void
-domaininit(void)
+domaininit(bool addroute)
{
__link_set_decl(domains, struct domain);
struct domain * const * dpp;
@@ -95,7 +95,7 @@
else
domain_attach(*dpp);
}
- if (rt_domain)
+ if (rt_domain && addroute)
domain_attach(rt_domain);
callout_init(&pffasttimo_ch, CALLOUT_MPSAFE);
Index: src/sys/sys/domain.h
diff -u src/sys/sys/domain.h:1.27 src/sys/sys/domain.h:1.28
--- src/sys/sys/domain.h:1.27 Wed Sep 19 04:33:45 2007
+++ src/sys/sys/domain.h Wed May 27 23:44:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: domain.h,v 1.27 2007/09/19 04:33:45 dyoung Exp $ */
+/* $NetBSD: domain.h,v 1.28 2009/05/27 23:44:35 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -94,7 +94,7 @@
#define DOMAIN_FOREACH(dom) STAILQ_FOREACH(dom, &domains, dom_link)
extern struct domainhead domains;
void domain_attach(struct domain *);
-void domaininit(void);
+void domaininit(bool);
#endif
#endif /* !_SYS_DOMAIN_H_ */
