diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2016-09-15 00:00:41 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2016-09-15 00:00:41 +0000 |
| commit | 1792bcd81c6527ef7f7f0386718aa7d473db7e01 (patch) | |
| tree | f6d09d27a546a0c1252612528a9d21fc97da0013 | |
| parent | 16d28241f468c366b201ce14448f53c133c0be51 (diff) | |
remove m_copym2 as its use has been replaced by m_dup_pkt
ok millert@ mpi@ henning@ claudio@ markus@
| -rw-r--r-- | share/man/man9/mbuf.9 | 13 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 12 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 3 |
3 files changed, 4 insertions, 24 deletions
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 3ebee83a933..839d01bfb70 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mbuf.9,v 1.103 2016/09/13 19:56:55 markus Exp $ +.\" $OpenBSD: mbuf.9,v 1.104 2016/09/15 00:00:40 dlg Exp $ .\" .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org> .\" All rights reserved. @@ -25,11 +25,10 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 13 2016 $ +.Dd $Mdocdate: September 15 2016 $ .Dt MGET 9 .Os .Sh NAME -.Nm m_copym2 , .Nm m_copym , .Nm m_free , .Nm m_get , @@ -70,8 +69,6 @@ .Sh SYNOPSIS .In sys/mbuf.h .Ft struct mbuf * -.Fn m_copym2 "struct mbuf *m" "int off" "int len" "int wait" -.Ft struct mbuf * .Fn m_copym "struct mbuf *m" "int off" "int len" "int wait" .Ft struct mbuf * .Fn m_free "struct mbuf *m" @@ -437,12 +434,6 @@ The parameter can be M_WAIT or M_DONTWAIT. It does not copy clusters, it just increases their reference count. -.It Fn m_copym2 "struct mbuf *m" "int off" "int len" "int wait" -The same as -.Fn m_copym -except that it copies cluster mbufs, whereas -.Fn m_copym -just increases the reference count of the clusters. .It Fn m_free "struct mbuf *m" Free the mbuf pointed to by .Fa m . diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 4eaad77104d..1353c3d9f75 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.228 2016/09/13 19:56:55 markus Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.229 2016/09/15 00:00:40 dlg Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -576,16 +576,6 @@ m_copym(struct mbuf *m, int off, int len, int wait) return m_copym0(m, off, len, wait, 0); /* shallow copy on M_EXT */ } -/* - * m_copym2() is like m_copym(), except it COPIES cluster mbufs, instead - * of merely bumping the reference count. - */ -struct mbuf * -m_copym2(struct mbuf *m, int off, int len, int wait) -{ - return m_copym0(m, off, len, wait, 1); /* deep copy */ -} - struct mbuf * m_copym0(struct mbuf *m0, int off, int len, int wait, int deep) { diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 5184713868c..0976f57287c 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.218 2016/09/13 19:56:55 markus Exp $ */ +/* $OpenBSD: mbuf.h,v 1.219 2016/09/15 00:00:40 dlg Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -423,7 +423,6 @@ extern int max_protohdr; /* largest protocol header */ extern int max_hdr; /* largest link+protocol header */ void mbinit(void); -struct mbuf *m_copym2(struct mbuf *, int, int, int); struct mbuf *m_copym(struct mbuf *, int, int, int); struct mbuf *m_free(struct mbuf *); struct mbuf *m_get(int, int); |