diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2011-05-04 16:05:50 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2011-05-04 16:05:50 +0000 |
| commit | 5f848fb5f2f55c199db2de8dfe5d9e5ef6c8ff11 (patch) | |
| tree | bca9d9b5c4ab3e082c07cc2014c2ccb94db8ad27 /sys/net/if_spppsubr.c | |
| parent | 59a218178fb54575bf5b30819c39cb1f242e2b65 (diff) | |
Collapse m_pullup and m_pullup2 into a single function, as they're
essentially identical; the only difference being that m_pullup2 is
capable of handling mbuf clusters, but called m_pullup for shorter
lengths (!).
testing dlg@ ok claudio@
Diffstat (limited to 'sys/net/if_spppsubr.c')
| -rw-r--r-- | sys/net/if_spppsubr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index b02368ecfd2..99d4dcc23db 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.85 2011/04/17 20:44:27 stsp Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.86 2011/05/04 16:05:49 blambert Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -540,7 +540,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m) /* preserve the alignment */ if (m->m_len < m->m_pkthdr.len) { - m = m_pullup2(m, m->m_pkthdr.len); + m = m_pullup(m, m->m_pkthdr.len); if (m == NULL) { if (debug) log(LOG_DEBUG, |