Deleted Added
full compact
if_var.h (121816) if_var.h (122524)
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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * 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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * From: @(#)if.h 8.1 (Berkeley) 6/10/93
34 * $FreeBSD: head/sys/net/if_var.h 121816 2003-10-31 18:32:15Z brooks $
34 * $FreeBSD: head/sys/net/if_var.h 122524 2003-11-12 03:14:31Z rwatson $
35 */
36
37#ifndef _NET_IF_VAR_H_
38#define _NET_IF_VAR_H_
39
40/*
41 * Structures defining a network interface, providing a packet
42 * transport mechanism (ala level 0 of the PUP protocols).

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

69struct mbuf;
70struct thread;
71struct rtentry;
72struct rt_addrinfo;
73struct socket;
74struct ether_header;
75#endif
76
35 */
36
37#ifndef _NET_IF_VAR_H_
38#define _NET_IF_VAR_H_
39
40/*
41 * Structures defining a network interface, providing a packet
42 * transport mechanism (ala level 0 of the PUP protocols).

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

69struct mbuf;
70struct thread;
71struct rtentry;
72struct rt_addrinfo;
73struct socket;
74struct ether_header;
75#endif
76
77#include <sys/_label.h> /* struct label */
78#include <sys/queue.h> /* get TAILQ macros */
79
80#ifdef _KERNEL
81#include <sys/mbuf.h>
82#endif /* _KERNEL */
83#include <sys/lock.h> /* XXX */
84#include <sys/mutex.h> /* XXX */
85#include <sys/event.h> /* XXX */

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

175 void (*if_init) /* Init routine */
176 (void *);
177 int (*if_resolvemulti) /* validate/resolve multicast */
178 (struct ifnet *, struct sockaddr **, struct sockaddr *);
179 struct ifqueue if_snd; /* output queue */
180 struct ifqueue *if_poll_slowq; /* input queue for slow devices */
181 struct ifprefixhead if_prefixhead; /* list of prefixes per if */
182 u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
77#include <sys/queue.h> /* get TAILQ macros */
78
79#ifdef _KERNEL
80#include <sys/mbuf.h>
81#endif /* _KERNEL */
82#include <sys/lock.h> /* XXX */
83#include <sys/mutex.h> /* XXX */
84#include <sys/event.h> /* XXX */

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

174 void (*if_init) /* Init routine */
175 (void *);
176 int (*if_resolvemulti) /* validate/resolve multicast */
177 (struct ifnet *, struct sockaddr **, struct sockaddr *);
178 struct ifqueue if_snd; /* output queue */
179 struct ifqueue *if_poll_slowq; /* input queue for slow devices */
180 struct ifprefixhead if_prefixhead; /* list of prefixes per if */
181 u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
183 struct label if_label; /* interface MAC label */
182 struct label *if_label; /* interface MAC label */
184
185 void *if_afdata[AF_MAX];
186 int if_afdata_initialized;
187 struct mtx if_afdata_mtx;
188};
189
190typedef void if_init_f_t(void *);
191

--- 313 unchanged lines hidden ---
183
184 void *if_afdata[AF_MAX];
185 int if_afdata_initialized;
186 struct mtx if_afdata_mtx;
187};
188
189typedef void if_init_f_t(void *);
190

--- 313 unchanged lines hidden ---