summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-05-14 02:02:57 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-05-14 02:02:57 +0000
commitb969db78093b7ecbff89fd06edf87a66122de457 (patch)
treeb51f8e8f971c9efecda3c6a7f5eac56cd081e995 /sys/netinet
parent7a7d6d9132db71b6d20affe529c5d103faf0c083 (diff)
move ETHERTYPE_xx declarations to <net/ethertypes.h>. meets netbsd practice.
deraadt ok
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/if_ether.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 21871a1d1be..72bf64583b3 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.h,v 1.27 2003/05/13 08:25:44 deraadt Exp $ */
+/* $OpenBSD: if_ether.h,v 1.28 2003/05/14 02:02:55 itojun Exp $ */
/* $NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $ */
/*
@@ -66,23 +66,7 @@ struct ether_header {
u_int16_t ether_type;
};
-#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
-#define ETHERTYPE_IP 0x0800 /* IP protocol */
-#define ETHERTYPE_ARP 0x0806 /* address resolution protocol */
-#define ETHERTYPE_REVARP 0x8035 /* reverse addr resolution protocol */
-#define ETHERTYPE_8021Q 0x8100 /* IEEE 802.1Q VLAN tagging */
-#define ETHERTYPE_IPV6 0x86DD /* IPv6 protocol */
-#define ETHERTYPE_PPPOEDISC 0x8863 /* PPP Over Ethernet Discovery Stage */
-#define ETHERTYPE_PPPOE 0x8864 /* PPP Over Ethernet Session Stage */
-#define ETHERTYPE_LOOPBACK 0x9000 /* used to test interfaces */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define ETHERTYPE_TRAIL 0x1000 /* Trailer packet */
-#define ETHERTYPE_NTRAILER 16
+#include <net/ethertypes.h>
#define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */