diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /include/net/ethernet.h | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
| download | uClibc-alpine-f757db2d319ccc5f7034165046fb2bb58901afb1.tar.bz2 uClibc-alpine-f757db2d319ccc5f7034165046fb2bb58901afb1.tar.xz | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include/net/ethernet.h')
| -rw-r--r-- | include/net/ethernet.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/net/ethernet.h b/include/net/ethernet.h index 7ca8e8348..0242d5899 100644 --- a/include/net/ethernet.h +++ b/include/net/ethernet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2001, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,9 +45,17 @@ struct ether_header /* Ethernet protocol ID's */ #define ETHERTYPE_PUP 0x0200 /* Xerox PUP */ +#define ETHERTYPE_SPRITE 0x0500 /* Sprite */ #define ETHERTYPE_IP 0x0800 /* IP */ #define ETHERTYPE_ARP 0x0806 /* Address resolution */ #define ETHERTYPE_REVARP 0x8035 /* Reverse ARP */ +#define ETHERTYPE_AT 0x809B /* AppleTalk protocol */ +#define ETHERTYPE_AARP 0x80F3 /* AppleTalk ARP */ +#define ETHERTYPE_VLAN 0x8100 /* IEEE 802.1Q VLAN tagging */ +#define ETHERTYPE_IPX 0x8137 /* IPX */ +#define ETHERTYPE_IPV6 0x86dd /* IP protocol version 6 */ +#define ETHERTYPE_LOOPBACK 0x9000 /* used to test interfaces */ + #define ETHER_ADDR_LEN ETH_ALEN /* size of ethernet addr */ #define ETHER_TYPE_LEN 2 /* bytes in type field */ |