Deleted Added
full compact
if_var.h (139823) if_var.h (142215)
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 139823 2005-01-07 01:45:51Z imp $
30 * $FreeBSD: head/sys/net/if_var.h 142215 2005-02-22 13:04:05Z 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).

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

63 * Forward structure declarations for function prototypes [sic].
64 */
65struct mbuf;
66struct thread;
67struct rtentry;
68struct rt_addrinfo;
69struct socket;
70struct ether_header;
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).

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

63 * Forward structure declarations for function prototypes [sic].
64 */
65struct mbuf;
66struct thread;
67struct rtentry;
68struct rt_addrinfo;
69struct socket;
70struct ether_header;
71struct carp_if;
71#endif
72
73#include <sys/queue.h> /* get TAILQ macros */
74
75#ifdef _KERNEL
76#include <sys/mbuf.h>
77#include <sys/eventhandler.h>
78#endif /* _KERNEL */

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

141 * of the list has type AF_LINK, and contains sockaddr_dl
142 * addresses which store the link-level address and the name
143 * of the interface.
144 * However, access to the AF_LINK address through this
145 * field is deprecated. Use ifaddr_byindex() instead.
146 */
147 struct knlist if_klist; /* events attached to this if */
148 int if_pcount; /* number of promiscuous listeners */
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 */

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

142 * of the list has type AF_LINK, and contains sockaddr_dl
143 * addresses which store the link-level address and the name
144 * of the interface.
145 * However, access to the AF_LINK address through this
146 * field is deprecated. Use ifaddr_byindex() instead.
147 */
148 struct knlist if_klist; /* events attached to this if */
149 int if_pcount; /* number of promiscuous listeners */
149 void *if_carp; /* carp (tbd) interface pointer */
150 struct carp_if *if_carp; /* carp interface structure */
150 struct bpf_if *if_bpf; /* packet filter structure */
151 u_short if_index; /* numeric abbreviation for this if */
152 short if_timer; /* time 'til if_watchdog called */
153 u_short if_nvlans; /* number of active vlans */
154 int if_flags; /* up/down, broadcast, etc. */
155 int if_capabilities; /* interface capabilities */
156 int if_capenable; /* enabled features */
157 void *if_linkmib; /* link-type-specific MIB data */

--- 506 unchanged lines hidden ---
151 struct bpf_if *if_bpf; /* packet filter structure */
152 u_short if_index; /* numeric abbreviation for this if */
153 short if_timer; /* time 'til if_watchdog called */
154 u_short if_nvlans; /* number of active vlans */
155 int if_flags; /* up/down, broadcast, etc. */
156 int if_capabilities; /* interface capabilities */
157 int if_capenable; /* enabled features */
158 void *if_linkmib; /* link-type-specific MIB data */

--- 506 unchanged lines hidden ---