From 2625d6d3e90af60f8e5777df3fed295d02d41fc0 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au>
Date: Tue, 7 Dec 2004 03:16:34 +0000
Subject: [PATCH] create a proper ETHERTYPE for ATAoverEthernet

svn path=/trunk/; revision=12674
---
 epan/dissectors/packet-aoe.c       | 3 +--
 epan/dissectors/packet-ethertype.c | 2 +-
 etypes.h                           | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 4cc3ae7ec8..7c85a392f5 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -32,8 +32,7 @@
 #endif
 
 #include <epan/packet.h>
-
-#define ETHERTYPE_AOE 0x88A2
+#include <etypes.h>
 
 static int proto_aoe;
 static int hf_aoe_version=-1;
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index d7fa4d7be4..29571f5b8c 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -90,7 +90,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_RTCFG,		"Real-Time Configuration Protocol" },
     {ETHERTYPE_CDMA2000_A10_UBS,"CDMA2000 A10 Unstructured byte stream" },
     {ETHERTYPE_PROFINET,	"PROFInet"			},
-
+    {ETHERTYPE_AOE,		"ATA over Ethernet"             },
     /*
      * NDISWAN on Windows translates Ethernet frames from higher-level
      * protocols into PPP frames to hand to the PPP driver, and translates
diff --git a/etypes.h b/etypes.h
index 2bf8b1fcc0..7f81ff2477 100644
--- a/etypes.h
+++ b/etypes.h
@@ -232,6 +232,10 @@
 #define ETHERTYPE_HYPERSCSI     0x889A  /* HyperSCSI */
 #endif
 
+#ifndef ETHERTYPE_AOE
+#define ETHERTYPE_AOE           0x88A2
+#endif
+
 #ifndef ETHERTYPE_BRDWALK
 #define ETHERTYPE_BRDWALK       0x88AE
 #endif