diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-06-25 01:50:19 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-06-25 01:50:19 +0000 |
| commit | f642fb2e9a5edbb5c8e001aab6f8d051ccfd10ac (patch) | |
| tree | 9ab160bd7df1a0dede4fbd84f86a4e072d37817a /sys/net | |
| parent | a10f9958afb69fd8b8735a135507dcf7ace599cb (diff) | |
Move common post M_COPY_HDR manipulation to the macro itself; angelos@ ok.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_gre.c | 4 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index e7a07d162e6..0386437295f 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.13 2001/06/22 14:28:58 deraadt Exp $ */ +/* $OpenBSD: if_gre.c,v 1.14 2001/06/25 01:50:16 fgsch Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -254,8 +254,6 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, return (ENOBUFS); } M_COPY_HDR(m0, m); - m_tag_init(m); - m->m_flags &= ~M_PKTHDR; 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 404431129b1..bd521d27fe8 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.20 2001/06/15 03:38:34 itojun Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.21 2001/06/25 01:50:17 fgsch Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -1287,11 +1287,8 @@ ppp_inproc(sc, m) goto bad; /* lose if big headers and no clusters */ } } - if (m->m_flags & M_PKTHDR) { + if (m->m_flags & M_PKTHDR) M_COPY_HDR(mp, m); - m_tag_init(m); - m->m_flags &= ~M_PKTHDR; - } cp = mtod(mp, u_char *); cp[0] = adrs; cp[1] = ctrl; |