| ipsec_mbuf.c (199894) | ipsec_mbuf.c (243882) |
|---|---|
| 1/*- 2 * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/sys/netipsec/ipsec_mbuf.c 199894 2009-11-28 21:01:26Z bz $ | 26 * $FreeBSD: head/sys/netipsec/ipsec_mbuf.c 243882 2012-12-05 08:04:20Z glebius $ |
| 27 */ 28 29/* 30 * IPsec-specific mbuf routines. 31 */ 32 33#include "opt_param.h" 34 --- 45 unchanged lines hidden (view full) --- 80 81 n0 = NULL; 82 np = &n0; 83 alloc = 0; 84 done = 0; 85 todo = remain; 86 while (todo > 0) { 87 if (todo > MHLEN) { | 27 */ 28 29/* 30 * IPsec-specific mbuf routines. 31 */ 32 33#include "opt_param.h" 34 --- 45 unchanged lines hidden (view full) --- 80 81 n0 = NULL; 82 np = &n0; 83 alloc = 0; 84 done = 0; 85 todo = remain; 86 while (todo > 0) { 87 if (todo > MHLEN) { |
| 88 n = m_getcl(M_DONTWAIT, m->m_type, 0); | 88 n = m_getcl(M_NOWAIT, m->m_type, 0); |
| 89 len = MCLBYTES; 90 } 91 else { | 89 len = MCLBYTES; 90 } 91 else { |
| 92 n = m_get(M_DONTWAIT, m->m_type); | 92 n = m_get(M_NOWAIT, m->m_type); |
| 93 len = MHLEN; 94 } 95 if (n == NULL) { 96 m_freem(n0); 97 return NULL; 98 } 99 *np = n; 100 np = &n->m_next; --- 9 unchanged lines hidden (view full) --- 110 m->m_len = skip + hlen; 111 *off = skip; 112 if (n0 != NULL) { 113 *np = m->m_next; 114 m->m_next = n0; 115 } 116 } 117 else { | 93 len = MHLEN; 94 } 95 if (n == NULL) { 96 m_freem(n0); 97 return NULL; 98 } 99 *np = n; 100 np = &n->m_next; --- 9 unchanged lines hidden (view full) --- 110 m->m_len = skip + hlen; 111 *off = skip; 112 if (n0 != NULL) { 113 *np = m->m_next; 114 m->m_next = n0; 115 } 116 } 117 else { |
| 118 n = m_get(M_DONTWAIT, m->m_type); | 118 n = m_get(M_NOWAIT, m->m_type); |
| 119 if (n == NULL) { 120 m_freem(n0); 121 return NULL; 122 } 123 alloc++; 124 125 if ((n->m_next = n0) == NULL) 126 np = &n->m_next; --- 71 unchanged lines hidden (view full) --- 198 return NULL; 199 } 200 201 m0 = m1->m_next; 202 } 203 204 if (pad > M_TRAILINGSPACE(m0)) { 205 /* Add an mbuf to the chain. */ | 119 if (n == NULL) { 120 m_freem(n0); 121 return NULL; 122 } 123 alloc++; 124 125 if ((n->m_next = n0) == NULL) 126 np = &n->m_next; --- 71 unchanged lines hidden (view full) --- 198 return NULL; 199 } 200 201 m0 = m1->m_next; 202 } 203 204 if (pad > M_TRAILINGSPACE(m0)) { 205 /* Add an mbuf to the chain. */ |
| 206 MGET(m1, M_DONTWAIT, MT_DATA); | 206 MGET(m1, M_NOWAIT, MT_DATA); |
| 207 if (m1 == 0) { 208 m_freem(m0); 209 DPRINTF(("%s: unable to get extra mbuf\n", __func__)); 210 return NULL; 211 } 212 213 m0->m_next = m1; 214 m0 = m1; --- 113 unchanged lines hidden --- | 207 if (m1 == 0) { 208 m_freem(m0); 209 DPRINTF(("%s: unable to get extra mbuf\n", __func__)); 210 return NULL; 211 } 212 213 m0->m_next = m1; 214 m0 = m1; --- 113 unchanged lines hidden --- |