Author: brueffer
Date: Thu Feb 23 17:47:19 2012
New Revision: 232051
URL: http://svn.freebsd.org/changeset/base/232051
Log:
Catch up with r195837 (2.5 years ago) which renamed net_add_domain() to
domain_add().
PR: 165424
Submitted by: Lachlan Kang
MFC after: 1 week
Modified:
head/ObsoleteFiles.inc
head/share/man/man9/Makefile
head/share/man/man9/domain.9
head/sys/kern/uipc_domain.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu Feb 23 16:47:05 2012 (r232050)
+++ head/ObsoleteFiles.inc Thu Feb 23 17:47:19 2012 (r232051)
@@ -707,6 +707,8 @@ OLD_LIBS+=usr/lib32/pam_unix.so.4
.endif
# 20090718: the gdm pam.d file is no longer required.
OLD_FILES+=etc/pam.d/gdm
+# 20090714: net_add_domain(9) renamed to domain_add(9)
+OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
# 20090713: vimage container structs removed.
OLD_FILES+=usr/include/netinet/vinet.h
OLD_FILES+=usr/include/netinet6/vinet6.h
Modified: head/share/man/man9/Makefile
==============================================================================
--- head/share/man/man9/Makefile Thu Feb 23 16:47:05 2012
(r232050)
+++ head/share/man/man9/Makefile Thu Feb 23 17:47:19 2012
(r232051)
@@ -615,7 +615,7 @@ MLINKS+=disk.9 disk_alloc.9 \
disk.9 disk_destroy.9 \
disk.9 disk_gone.9
MLINKS+=domain.9 DOMAIN_SET.9 \
- domain.9 net_add_domain.9 \
+ domain.9 domain_add.9 \
domain.9 pfctlinput.9 \
domain.9 pfctlinput2.9 \
domain.9 pffindproto.9 \
Modified: head/share/man/man9/domain.9
==============================================================================
--- head/share/man/man9/domain.9 Thu Feb 23 16:47:05 2012
(r232050)
+++ head/share/man/man9/domain.9 Thu Feb 23 17:47:19 2012
(r232051)
@@ -26,11 +26,11 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 23, 2008
+.Dd February 23, 2012
.Dt DOMAIN 9
.Os
.Sh NAME
-.Nm net_add_domain ,
+.Nm domain_add ,
.Nm pfctlinput ,
.Nm pfctlinput2 ,
.Nm pffindproto ,
@@ -43,7 +43,7 @@
.In sys/protosw.h
.In sys/domain.h
.Ft void
-.Fn net_add_domain "void *data"
+.Fn domain_add "void *data"
.Ft void
.Fn pfctlinput "int cmd" "struct sockaddr *sa"
.Ft void
@@ -142,7 +142,7 @@ have their
.Fn pr_ctlinput
function called.
.Pp
-.Fn net_add_domain
+.Fn domain_add
adds a new protocol domain to the system.
The argument
.Fa data
@@ -153,13 +153,13 @@ within the function, but is declared
in order to prevent compiler warnings when new domains are registered with
.Fn SYSINIT .
In most cases
-.Fn net_add_domain
+.Fn domain_add
is not called directly, instead
.Fn DOMAIN_SET
is used.
.Pp
If the new domain has defined an initialization routine, it is called by
-.Fn net_add_domain ;
+.Fn domain_add ;
as well, each of the protocols within the domain that have defined an
initialization routine will have theirs called.
.Pp
Modified: head/sys/kern/uipc_domain.c
==============================================================================
--- head/sys/kern/uipc_domain.c Thu Feb 23 16:47:05 2012 (r232050)
+++ head/sys/kern/uipc_domain.c Thu Feb 23 17:47:19 2012 (r232051)
@@ -220,7 +220,7 @@ domain_add(void *data)
domains = dp;
KASSERT(domain_init_status >= 1,
- ("attempt to net_add_domain(%s) before domaininit()",
+ ("attempt to domain_add(%s) before domaininit()",
dp->dom_name));
#ifndef INVARIANTS
if (domain_init_status < 1)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
