Deleted Added
full compact
if.c (185435) if.c (185571)
1/*-
2 * Copyright (c) 1980, 1986, 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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 * @(#)if.c 8.5 (Berkeley) 1/9/95
1/*-
2 * Copyright (c) 1980, 1986, 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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 * @(#)if.c 8.5 (Berkeley) 1/9/95
30 * $FreeBSD: head/sys/net/if.c 185435 2008-11-29 14:32:14Z bz $
30 * $FreeBSD: head/sys/net/if.c 185571 2008-12-02 21:37:28Z bz $
31 */
32
33#include "opt_compat.h"
34#include "opt_inet6.h"
35#include "opt_inet.h"
36#include "opt_mac.h"
37#include "opt_carp.h"
38

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

62#include <net/if.h>
63#include <net/if_arp.h>
64#include <net/if_clone.h>
65#include <net/if_dl.h>
66#include <net/if_types.h>
67#include <net/if_var.h>
68#include <net/radix.h>
69#include <net/route.h>
31 */
32
33#include "opt_compat.h"
34#include "opt_inet6.h"
35#include "opt_inet.h"
36#include "opt_mac.h"
37#include "opt_carp.h"
38

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

62#include <net/if.h>
63#include <net/if_arp.h>
64#include <net/if_clone.h>
65#include <net/if_dl.h>
66#include <net/if_types.h>
67#include <net/if_var.h>
68#include <net/radix.h>
69#include <net/route.h>
70#include <net/vnet.h>
70
71#if defined(INET) || defined(INET6)
72/*XXX*/
73#include <netinet/in.h>
74#include <netinet/in_var.h>
75#ifdef INET6
76#include <netinet6/in6_var.h>
77#include <netinet6/in6_ifattach.h>
78#endif
79#endif
80#ifdef INET
81#include <netinet/if_ether.h>
71
72#if defined(INET) || defined(INET6)
73/*XXX*/
74#include <netinet/in.h>
75#include <netinet/in_var.h>
76#ifdef INET6
77#include <netinet6/in6_var.h>
78#include <netinet6/in6_ifattach.h>
79#endif
80#endif
81#ifdef INET
82#include <netinet/if_ether.h>
83#include <netinet/vinet.h>
82#endif
83#ifdef DEV_CARP
84#include <netinet/ip_carp.h>
85#endif
86
87#include <security/mac/mac_framework.h>
88
89SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");

--- 2789 unchanged lines hidden ---
84#endif
85#ifdef DEV_CARP
86#include <netinet/ip_carp.h>
87#endif
88
89#include <security/mac/mac_framework.h>
90
91SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");

--- 2789 unchanged lines hidden ---