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/netinet | |
| 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/netinet')
| -rw-r--r-- | sys/netinet/ip_carp.c | 4 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 18612047086..7c1722d23cb 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.183 2011/04/29 12:36:31 mpf Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.184 2011/05/04 16:05:49 blambert Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -591,7 +591,7 @@ carp_proto_input(struct mbuf *m, ...) return; } - if ((m = m_pullup2(m, len)) == NULL) { + if ((m = m_pullup(m, len)) == NULL) { carpstats.carps_hdrops++; return; } diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 58e0a040ec1..53906eece24 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.142 2011/04/28 09:56:27 claudio Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.143 2011/05/04 16:05:49 blambert Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -352,7 +352,7 @@ udp_input(struct mbuf *m, ...) * to userland */ if (spi != 0) { - if ((m = m_pullup2(m, skip)) == NULL) { + if ((m = m_pullup(m, skip)) == NULL) { udpstat.udps_hdrops++; return; } |