4 files changed, 7 insertions, 12 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 89ccd9bc1048..b9745ea23013 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161010: remove link to removed m_getclr(9) macro
+OLD_FILES+=usr/share/man/man9/m_getclr.9
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index c0116802bb03..dbf84947974d 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1138,7 +1138,6 @@ MLINKS+=\
 	mbuf.9 m_get2.9 \
 	mbuf.9 m_getjcl.9 \
 	mbuf.9 m_getcl.9 \
-	mbuf.9 m_getclr.9 \
 	mbuf.9 MGETHDR.9 \
 	mbuf.9 m_gethdr.9 \
 	mbuf.9 m_getm.9 \
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 233caf086e66..a4fa70606a97 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 30, 2016
+.Dd October 10, 2016
 .Dt MBUF 9
 .Os
 .\"
@@ -79,8 +79,6 @@
 .Ft struct mbuf *
 .Fn m_getcl "int how" "short type" "int flags"
 .Ft struct mbuf *
-.Fn m_getclr "int how" "short type"
-.Ft struct mbuf *
 .Fn m_gethdr "int how" "short type"
 .Ft struct mbuf *
 .Fn m_free "struct mbuf *mbuf"
@@ -107,7 +105,7 @@
 .Ft struct mbuf *
 .Fn m_copypacket "struct mbuf *mbuf" "int how"
 .Ft struct mbuf *
-.Fn m_dup "struct mbuf *mbuf" "int how"
+.Fn m_dup "const struct mbuf *mbuf" "int how"
 .Ft void
 .Fn m_copydata "const struct mbuf *mbuf" "int offset" "int len" "caddr_t buf"
 .Ft void
@@ -126,8 +124,8 @@
 .Fn m_catpkt "struct mbuf *m" "struct mbuf *n"
 .Ft u_int
 .Fn m_fixhdr "struct mbuf *mbuf"
-.Ft void
-.Fn m_dup_pkthdr "struct mbuf *to" "struct mbuf *from"
+.Ft int
+.Fn m_dup_pkthdr "struct mbuf *to" "const struct mbuf *from" "int how"
 .Ft void
 .Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from"
 .Ft u_int
@@ -602,10 +600,6 @@ This is like
 but it the size of the cluster allocated will be large enough for
 .Fa size
 bytes.
-.It Fn m_getclr how type
-Allocate an
-.Vt mbuf
-and zero out the data region.
 .It Fn m_free mbuf
 Frees
 .Vt mbuf .
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index c812a3f25bd7..66be8377b100 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -33,7 +33,7 @@
 .Ft "struct m_tag *"
 .Fn m_tag_copy "struct m_tag *t" "int how"
 .Ft int
-.Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from" "int how"
+.Fn m_tag_copy_chain "struct mbuf *to" "const struct mbuf *from" "int how"
 .Ft void
 .Fn m_tag_delete "struct mbuf *m" "struct m_tag *t"
 .Ft void