diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-27 03:49:56 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-27 03:49:56 +0000 |
| commit | 5a60def576e7a9fc33be3c2ce84e9c5a4ea87acf (patch) | |
| tree | eec94d4164616ff7c03e306b4723bda222307b2f /sys/net | |
| parent | cc7d393f894b86439bc3d6e082a11123747a46bd (diff) | |
Get rid of M_COPY_* macros; either use M_MOVE_* or M_DUP_*, depending
on how macros should be treated. Code by fgsch@, ok by me and itojun@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_gre.c | 4 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 4 | ||||
| -rw-r--r-- | sys/net/if_vlan.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 31e6c1be535..27c6f00d41a 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.16 2001/06/25 06:31:44 angelos Exp $ */ +/* $OpenBSD: if_gre.c,v 1.17 2001/06/27 03:49:53 angelos Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -260,7 +260,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, m_freem(m); return (ENOBUFS); } - M_COPY_HDR(m0, m); + M_MOVE_HDR(m0, m); m0->m_len = msiz + (inp->ip_hl << 2); m0->m_data += max_linkhdr; diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index bd521d27fe8..96fbe46d218 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.21 2001/06/25 01:50:17 fgsch Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.22 2001/06/27 03:49:53 angelos Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -1288,7 +1288,7 @@ ppp_inproc(sc, m) } } if (m->m_flags & M_PKTHDR) - M_COPY_HDR(mp, m); + M_MOVE_HDR(mp, m); cp = mtod(mp, u_char *); cp[0] = adrs; cp[1] = ctrl; diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 0d75bdce57b..fcb27c76b22 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.22 2001/06/25 02:53:29 angelos Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.23 2001/06/27 03:49:53 angelos Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology * @@ -248,7 +248,7 @@ vlan_start(struct ifnet *ifp) } if (m0->m_flags & M_PKTHDR) - M_COPY_PKTHDR(m0, m); + M_MOVE_PKTHDR(m0, m); m0->m_flags &= ~M_PROTO1; m0->m_next = m; |