Deleted Added
sdiff udiff text old ( 216859 ) new ( 219819 )
full compact
if_llatbl.h (216859) if_llatbl.h (219819)
1/*
2 * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
3 * Copyright (c) 2004-2008 Qing Li. All rights reserved.
4 * Copyright (c) 2008 Kip Macy. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
3 * Copyright (c) 2004-2008 Qing Li. All rights reserved.
4 * Copyright (c) 2008 Kip Macy. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/net/if_llatbl.h 216859 2010-12-31 21:57:54Z bz $");
28__FBSDID("$FreeBSD: head/sys/net/if_llatbl.h 219819 2011-03-21 09:40:01Z jeff $");
29
30#ifndef _NET_IF_LLATBL_H_
31#define _NET_IF_LLATBL_H_
32
29
30#ifndef _NET_IF_LLATBL_H_
31#define _NET_IF_LLATBL_H_
32
33#include "opt_ofed.h"
34
33#include <sys/_rwlock.h>
34#include <netinet/in.h>
35
36struct ifnet;
37struct sysctl_req;
38struct rt_msghdr;
39struct rt_addrinfo;
40

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

67 int16_t ln_state; /* IPv6 has ND6_LLINFO_NOSTATE == -2 */
68 uint16_t ln_router;
69 time_t ln_ntick;
70 int lle_refcnt;
71
72 union {
73 uint64_t mac_aligned;
74 uint16_t mac16[3];
35#include <sys/_rwlock.h>
36#include <netinet/in.h>
37
38struct ifnet;
39struct sysctl_req;
40struct rt_msghdr;
41struct rt_addrinfo;
42

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

69 int16_t ln_state; /* IPv6 has ND6_LLINFO_NOSTATE == -2 */
70 uint16_t ln_router;
71 time_t ln_ntick;
72 int lle_refcnt;
73
74 union {
75 uint64_t mac_aligned;
76 uint16_t mac16[3];
77#ifdef OFED
78 uint8_t mac8[20]; /* IB needs 20 bytes. */
79#endif
75 } ll_addr;
76
77 /* XXX af-private? */
78 union {
79 struct callout ln_timer_ch;
80 struct callout la_timer;
81 } lle_timer;
82 /* NB: struct sockaddr must immediately follow */

--- 120 unchanged lines hidden --- 		80 } ll_addr;
81
82 /* XXX af-private? */
83 union {
84 struct callout ln_timer_ch;
85 struct callout la_timer;
86 } lle_timer;
87 /* NB: struct sockaddr must immediately follow */

--- 120 unchanged lines hidden ---