| ip_output.c (175892) | ip_output.c (177599) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/netinet/ip_output.c 175892 2008-02-02 14:11:31Z bz $"); | 33__FBSDID("$FreeBSD: head/sys/netinet/ip_output.c 177599 2008-03-25 09:39:02Z ru $"); |
| 34 35#include "opt_ipfw.h" 36#include "opt_ipsec.h" 37#include "opt_mac.h" 38#include "opt_mbuf_stress_test.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 776 unchanged lines hidden (view full) --- 818 case IP_RETOPTS: 819#endif 820 { 821 struct mbuf *m; 822 if (sopt->sopt_valsize > MLEN) { 823 error = EMSGSIZE; 824 break; 825 } | 34 35#include "opt_ipfw.h" 36#include "opt_ipsec.h" 37#include "opt_mac.h" 38#include "opt_mbuf_stress_test.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 776 unchanged lines hidden (view full) --- 818 case IP_RETOPTS: 819#endif 820 { 821 struct mbuf *m; 822 if (sopt->sopt_valsize > MLEN) { 823 error = EMSGSIZE; 824 break; 825 } |
| 826 MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA); | 826 MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA); |
| 827 if (m == NULL) { 828 error = ENOBUFS; 829 break; 830 } 831 m->m_len = sopt->sopt_valsize; 832 error = sooptcopyin(sopt, mtod(m, char *), m->m_len, 833 m->m_len); 834 if (error) { --- 350 unchanged lines hidden --- | 827 if (m == NULL) { 828 error = ENOBUFS; 829 break; 830 } 831 m->m_len = sopt->sopt_valsize; 832 error = sooptcopyin(sopt, mtod(m, char *), m->m_len, 833 m->m_len); 834 if (error) { --- 350 unchanged lines hidden --- |