Deleted Added
full compact
pf_if.c (183550) pf_if.c (185571)
1/* $OpenBSD: pf_if.c,v 1.46 2006/12/13 09:01:59 itojun Exp $ */
2
3/*
4 * Copyright 2005 Henning Brauer <henning@openbsd.org>
5 * Copyright 2005 Ryan McBride <mcbride@openbsd.org>
6 * Copyright (c) 2001 Daniel Hartmeier
7 * Copyright (c) 2003 Cedric Berger
8 * All rights reserved.

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

32 * POSSIBILITY OF SUCH DAMAGE.
33 */
34
35#if defined(__FreeBSD__)
36#include "opt_inet.h"
37#include "opt_inet6.h"
38
39#include <sys/cdefs.h>
1/* $OpenBSD: pf_if.c,v 1.46 2006/12/13 09:01:59 itojun Exp $ */
2
3/*
4 * Copyright 2005 Henning Brauer <henning@openbsd.org>
5 * Copyright 2005 Ryan McBride <mcbride@openbsd.org>
6 * Copyright (c) 2001 Daniel Hartmeier
7 * Copyright (c) 2003 Cedric Berger
8 * All rights reserved.

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

32 * POSSIBILITY OF SUCH DAMAGE.
33 */
34
35#if defined(__FreeBSD__)
36#include "opt_inet.h"
37#include "opt_inet6.h"
38
39#include <sys/cdefs.h>
40__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf_if.c 183550 2008-10-02 15:37:58Z zec $");
40__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf_if.c 185571 2008-12-02 21:37:28Z bz $");
41#endif
42
43#include <sys/param.h>
44#include <sys/systm.h>
45#ifdef __FreeBSD__
46#include <sys/malloc.h>
47#endif
48#include <sys/mbuf.h>
49#include <sys/filio.h>
50#include <sys/socket.h>
51#include <sys/socketvar.h>
52#include <sys/kernel.h>
53#ifndef __FreeBSD__
54#include <sys/device.h>
55#endif
56#include <sys/time.h>
41#endif
42
43#include <sys/param.h>
44#include <sys/systm.h>
45#ifdef __FreeBSD__
46#include <sys/malloc.h>
47#endif
48#include <sys/mbuf.h>
49#include <sys/filio.h>
50#include <sys/socket.h>
51#include <sys/socketvar.h>
52#include <sys/kernel.h>
53#ifndef __FreeBSD__
54#include <sys/device.h>
55#endif
56#include <sys/time.h>
57#ifdef __FreeBSD__
57#include <sys/vimage.h>
58#include <sys/vimage.h>
59#endif
58
59#include <net/if.h>
60#include <net/if_types.h>
60
61#include <net/if.h>
62#include <net/if_types.h>
63#ifdef __FreeBSD__
64#include <net/vnet.h>
65#endif
61
62#include <netinet/in.h>
63#include <netinet/in_var.h>
64#include <netinet/in_systm.h>
65#include <netinet/ip.h>
66#include <netinet/ip_var.h>
67
68#include <net/pfvar.h>

--- 880 unchanged lines hidden ---
66
67#include <netinet/in.h>
68#include <netinet/in_var.h>
69#include <netinet/in_systm.h>
70#include <netinet/ip.h>
71#include <netinet/ip_var.h>
72
73#include <net/pfvar.h>

--- 880 unchanged lines hidden ---