Deleted Added
full compact
if_var.h (152315) if_var.h (155051)
1/*-
2 * Copyright (c) 1982, 1986, 1989, 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 * From: @(#)if.h 8.1 (Berkeley) 6/10/93
1/*-
2 * Copyright (c) 1982, 1986, 1989, 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 * From: @(#)if.h 8.1 (Berkeley) 6/10/93
30 * $FreeBSD: head/sys/net/if_var.h 152315 2005-11-11 16:04:59Z ru $
30 * $FreeBSD: head/sys/net/if_var.h 155051 2006-01-30 13:45:15Z glebius $
31 */
32
33#ifndef _NET_IF_VAR_H_
34#define _NET_IF_VAR_H_
35
36/*
37 * Structures defining a network interface, providing a packet
38 * transport mechanism (ala level 0 of the PUP protocols).

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

64 */
65struct mbuf;
66struct thread;
67struct rtentry;
68struct rt_addrinfo;
69struct socket;
70struct ether_header;
71struct carp_if;
31 */
32
33#ifndef _NET_IF_VAR_H_
34#define _NET_IF_VAR_H_
35
36/*
37 * Structures defining a network interface, providing a packet
38 * transport mechanism (ala level 0 of the PUP protocols).

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

64 */
65struct mbuf;
66struct thread;
67struct rtentry;
68struct rt_addrinfo;
69struct socket;
70struct ether_header;
71struct carp_if;
72struct ifvlantrunk;
72#endif
73
74#include <sys/queue.h> /* get TAILQ macros */
75
76#ifdef _KERNEL
77#include <sys/mbuf.h>
78#include <sys/eventhandler.h>
79#endif /* _KERNEL */

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

128 * field is deprecated. Use if_addr or ifaddr_byindex() instead.
129 */
130 struct knlist if_klist; /* events attached to this if */
131 int if_pcount; /* number of promiscuous listeners */
132 struct carp_if *if_carp; /* carp interface structure */
133 struct bpf_if *if_bpf; /* packet filter structure */
134 u_short if_index; /* numeric abbreviation for this if */
135 short if_timer; /* time 'til if_watchdog called */
73#endif
74
75#include <sys/queue.h> /* get TAILQ macros */
76
77#ifdef _KERNEL
78#include <sys/mbuf.h>
79#include <sys/eventhandler.h>
80#endif /* _KERNEL */

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

129 * field is deprecated. Use if_addr or ifaddr_byindex() instead.
130 */
131 struct knlist if_klist; /* events attached to this if */
132 int if_pcount; /* number of promiscuous listeners */
133 struct carp_if *if_carp; /* carp interface structure */
134 struct bpf_if *if_bpf; /* packet filter structure */
135 u_short if_index; /* numeric abbreviation for this if */
136 short if_timer; /* time 'til if_watchdog called */
136 u_short if_nvlans; /* number of active vlans */
137 struct ifvlantrunk *if_vlantrunk; /* pointer to 802.1q data */
137 int if_flags; /* up/down, broadcast, etc. */
138 int if_capabilities; /* interface capabilities */
139 int if_capenable; /* enabled features */
140 void *if_linkmib; /* link-type-specific MIB data */
141 size_t if_linkmiblen; /* length of above data */
142 struct if_data if_data;
143 struct ifmultihead if_multiaddrs; /* multicast addresses configured */
144 int if_amcount; /* number of all-multicast requests */

--- 528 unchanged lines hidden ---
138 int if_flags; /* up/down, broadcast, etc. */
139 int if_capabilities; /* interface capabilities */
140 int if_capenable; /* enabled features */
141 void *if_linkmib; /* link-type-specific MIB data */
142 size_t if_linkmiblen; /* length of above data */
143 struct if_data if_data;
144 struct ifmultihead if_multiaddrs; /* multicast addresses configured */
145 int if_amcount; /* number of all-multicast requests */

--- 528 unchanged lines hidden ---