Deleted Added
full compact
ip6_output.c (177165) ip6_output.c (177167)
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
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

--- 47 unchanged lines hidden (view full) ---

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94
61 */
62
63#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
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

--- 47 unchanged lines hidden (view full) ---

56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 *
60 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94
61 */
62
63#include <sys/cdefs.h>
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_output.c 177165 2008-03-14 11:09:11Z bz $");
64__FBSDID("$FreeBSD: head/sys/netinet6/ip6_output.c 177167 2008-03-14 11:55:04Z bz $");
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69
70#include <sys/param.h>
71#include <sys/kernel.h>
72#include <sys/malloc.h>

--- 1004 unchanged lines hidden (view full) ---

1077 ip6stat.ip6s_fragmented++;
1078
1079done:
1080 if (ro == &ip6route && ro->ro_rt) { /* brace necessary for RTFREE */
1081 RTFREE(ro->ro_rt);
1082 } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt) {
1083 RTFREE(ro_pmtu->ro_rt);
1084 }
65
66#include "opt_inet.h"
67#include "opt_inet6.h"
68#include "opt_ipsec.h"
69
70#include <sys/param.h>
71#include <sys/kernel.h>
72#include <sys/malloc.h>

--- 1004 unchanged lines hidden (view full) ---

1077 ip6stat.ip6s_fragmented++;
1078
1079done:
1080 if (ro == &ip6route && ro->ro_rt) { /* brace necessary for RTFREE */
1081 RTFREE(ro->ro_rt);
1082 } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt) {
1083 RTFREE(ro_pmtu->ro_rt);
1084 }
1085#ifdef IPSEC
1086 if (sp != NULL)
1087 KEY_FREESP(&sp);
1088#endif
1085
1086 return (error);
1087
1088freehdrs:
1089 m_freem(exthdrs.ip6e_hbh); /* m_freem will check if mbuf is 0 */
1090 m_freem(exthdrs.ip6e_dest1);
1091 m_freem(exthdrs.ip6e_rthdr);
1092 m_freem(exthdrs.ip6e_dest2);

--- 2234 unchanged lines hidden ---
1089
1090 return (error);
1091
1092freehdrs:
1093 m_freem(exthdrs.ip6e_hbh); /* m_freem will check if mbuf is 0 */
1094 m_freem(exthdrs.ip6e_dest1);
1095 m_freem(exthdrs.ip6e_rthdr);
1096 m_freem(exthdrs.ip6e_dest2);

--- 2234 unchanged lines hidden ---