Deleted Added
full compact
in6_gif.c (183550) in6_gif.c (185571)
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

--- 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 * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $
30 */
31
32#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

--- 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 * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet6/in6_gif.c 183550 2008-10-02 15:37:58Z zec $");
33__FBSDID("$FreeBSD: head/sys/netinet6/in6_gif.c 185571 2008-12-02 21:37:28Z bz $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>

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

61#include <netinet6/ip6_var.h>
62#include <netinet6/in6_gif.h>
63#include <netinet6/in6_var.h>
64#endif
65#include <netinet6/ip6protosw.h>
66#include <netinet/ip_ecn.h>
67#ifdef INET6
68#include <netinet6/ip6_ecn.h>
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/socket.h>
41#include <sys/sockio.h>

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

61#include <netinet6/ip6_var.h>
62#include <netinet6/in6_gif.h>
63#include <netinet6/in6_var.h>
64#endif
65#include <netinet6/ip6protosw.h>
66#include <netinet/ip_ecn.h>
67#ifdef INET6
68#include <netinet6/ip6_ecn.h>
69#include <netinet6/vinet6.h>
69#endif
70
71#include <net/if_gif.h>
72
73static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
74 struct ifnet *);
75
76extern struct domain inet6domain;

--- 351 unchanged lines hidden ---
70#endif
71
72#include <net/if_gif.h>
73
74static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
75 struct ifnet *);
76
77extern struct domain inet6domain;

--- 351 unchanged lines hidden ---