Deleted Added
full compact
if_arp.h (196797) if_arp.h (219819)
1/*-
2 * Copyright (c) 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_arp.h 8.1 (Berkeley) 6/10/93
1/*-
2 * Copyright (c) 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_arp.h 8.1 (Berkeley) 6/10/93
30 * $FreeBSD: head/sys/net/if_arp.h 196797 2009-09-03 21:10:57Z gnn $
30 * $FreeBSD: head/sys/net/if_arp.h 219819 2011-03-21 09:40:01Z jeff $
31 */
32
33#ifndef _NET_IF_ARP_H_
34#define _NET_IF_ARP_H_
35
36/*
37 * Address Resolution Protocol.
38 *

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

45 */
46struct arphdr {
47 u_short ar_hrd; /* format of hardware address */
48#define ARPHRD_ETHER 1 /* ethernet hardware format */
49#define ARPHRD_IEEE802 6 /* token-ring hardware format */
50#define ARPHRD_ARCNET 7 /* arcnet hardware format */
51#define ARPHRD_FRELAY 15 /* frame relay hardware format */
52#define ARPHRD_IEEE1394 24 /* firewire hardware format */
31 */
32
33#ifndef _NET_IF_ARP_H_
34#define _NET_IF_ARP_H_
35
36/*
37 * Address Resolution Protocol.
38 *

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

45 */
46struct arphdr {
47 u_short ar_hrd; /* format of hardware address */
48#define ARPHRD_ETHER 1 /* ethernet hardware format */
49#define ARPHRD_IEEE802 6 /* token-ring hardware format */
50#define ARPHRD_ARCNET 7 /* arcnet hardware format */
51#define ARPHRD_FRELAY 15 /* frame relay hardware format */
52#define ARPHRD_IEEE1394 24 /* firewire hardware format */
53#define ARPHRD_INFINIBAND 32 /* infiniband hardware format */
53 u_short ar_pro; /* format of protocol address */
54 u_char ar_hln; /* length of hardware address */
55 u_char ar_pln; /* length of protocol address */
56 u_short ar_op; /* one of: */
57#define ARPOP_REQUEST 1 /* request to resolve address */
58#define ARPOP_REPLY 2 /* response to previous request */
59#define ARPOP_REVREQUEST 3 /* request protocol address given hardware */
60#define ARPOP_REVREPLY 4 /* response giving protocol address */

--- 78 unchanged lines hidden ---
54 u_short ar_pro; /* format of protocol address */
55 u_char ar_hln; /* length of hardware address */
56 u_char ar_pln; /* length of protocol address */
57 u_short ar_op; /* one of: */
58#define ARPOP_REQUEST 1 /* request to resolve address */
59#define ARPOP_REPLY 2 /* response to previous request */
60#define ARPOP_REVREQUEST 3 /* request protocol address given hardware */
61#define ARPOP_REVREPLY 4 /* response giving protocol address */

--- 78 unchanged lines hidden ---