git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add makefiles
[obnox/wireshark/wip.git]
/
epan
/
etypes.h
diff --git
a/epan/etypes.h
b/epan/etypes.h
index 3655f5111e090976a1c7430a9b779a4056a11347..62702b2b87c399ca3ce5a654fb53d9e5d53b3c2b 100644
(file)
--- a/
epan/etypes.h
+++ b/
epan/etypes.h
@@
-216,6
+216,10
@@
#define ETHERTYPE_PPPOED 0x8863 /* PPPoE Discovery Protocol */
#endif
#define ETHERTYPE_PPPOED 0x8863 /* PPPoE Discovery Protocol */
#endif
+#ifndef ETHERTYPE_FOUNDRY
+#define ETHERTYPE_FOUNDRY 0x885a /* Some Foundry proprietary protocol */
+#endif
+
#ifndef ETHERTYPE_PPPOES
#define ETHERTYPE_PPPOES 0x8864 /* PPPoE Session Protocol */
#endif
#ifndef ETHERTYPE_PPPOES
#define ETHERTYPE_PPPOES 0x8864 /* PPPoE Session Protocol */
#endif
@@
-264,6
+268,10
@@
#define ETHERTYPE_RSN_PREAUTH 0x88c7 /* 802.11i Pre-Authentication */
#endif
#define ETHERTYPE_RSN_PREAUTH 0x88c7 /* 802.11i Pre-Authentication */
#endif
+#ifndef ETHERTYPE_TIPC
+#define ETHERTYPE_TIPC 0x88ca /* TIPC (Transparent Inter Process Communication, */
+#endif /* http://tipc.sourceforge.net/) Ericsson Research Canada Inc */
+
#ifndef ETHERTYPE_LLDP
#define ETHERTYPE_LLDP 0x88cc /* IEEE 802.1 Link Layer Discovery Protocol (LLDP) */
#endif
#ifndef ETHERTYPE_LLDP
#define ETHERTYPE_LLDP 0x88cc /* IEEE 802.1 Link Layer Discovery Protocol (LLDP) */
#endif