| ubsec.c (106579) | ubsec.c (108466) |
|---|---|
| 1/* $FreeBSD: head/sys/dev/ubsec/ubsec.c 106579 2002-11-07 21:25:49Z jhb $ */ | 1/* $FreeBSD: head/sys/dev/ubsec/ubsec.c 108466 2002-12-30 20:22:40Z sam $ */ |
| 2/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ 3 4/* 5 * Copyright (c) 2000 Jason L. Wright (jason@thought.net) 6 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org) 7 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com) 8 * 9 * All rights reserved. --- 1254 unchanged lines hidden (view full) --- 1264 int totlen, len; 1265 struct mbuf *m, *top, **mp; 1266 1267 ubsecstats.hst_unaligned++; 1268 totlen = q->q_src_mapsize; 1269 if (q->q_src_m->m_flags & M_PKTHDR) { 1270 len = MHLEN; 1271 MGETHDR(m, M_DONTWAIT, MT_DATA); | 2/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ 3 4/* 5 * Copyright (c) 2000 Jason L. Wright (jason@thought.net) 6 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org) 7 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com) 8 * 9 * All rights reserved. --- 1254 unchanged lines hidden (view full) --- 1264 int totlen, len; 1265 struct mbuf *m, *top, **mp; 1266 1267 ubsecstats.hst_unaligned++; 1268 totlen = q->q_src_mapsize; 1269 if (q->q_src_m->m_flags & M_PKTHDR) { 1270 len = MHLEN; 1271 MGETHDR(m, M_DONTWAIT, MT_DATA); |
| 1272 if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) { 1273 m_free(m); 1274 m = NULL; 1275 } |
|
| 1272 } else { 1273 len = MLEN; 1274 MGET(m, M_DONTWAIT, MT_DATA); 1275 } 1276 if (m == NULL) { 1277 ubsecstats.hst_nombuf++; 1278 err = sc->sc_nqueue ? ERESTART : ENOMEM; 1279 goto errout; 1280 } | 1276 } else { 1277 len = MLEN; 1278 MGET(m, M_DONTWAIT, MT_DATA); 1279 } 1280 if (m == NULL) { 1281 ubsecstats.hst_nombuf++; 1282 err = sc->sc_nqueue ? ERESTART : ENOMEM; 1283 goto errout; 1284 } |
| 1281 if (len == MHLEN) 1282 M_COPY_PKTHDR(m, q->q_src_m); | |
| 1283 if (totlen >= MINCLSIZE) { 1284 MCLGET(m, M_DONTWAIT); 1285 if ((m->m_flags & M_EXT) == 0) { 1286 m_free(m); 1287 ubsecstats.hst_nomcl++; 1288 err = sc->sc_nqueue ? ERESTART : ENOMEM; 1289 goto errout; 1290 } --- 1473 unchanged lines hidden --- | 1285 if (totlen >= MINCLSIZE) { 1286 MCLGET(m, M_DONTWAIT); 1287 if ((m->m_flags & M_EXT) == 0) { 1288 m_free(m); 1289 ubsecstats.hst_nomcl++; 1290 err = sc->sc_nqueue ? ERESTART : ENOMEM; 1291 goto errout; 1292 } --- 1473 unchanged lines hidden --- |