From Mark C. Brown: add HP's OUI.

Update Gerald's e-mail address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12256 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index e7f1b21a2e02e1452ee3067c4364f67f92770445..0d60f70b3cfbc86b45b5fa4cea2174da5eaf0c21 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -178,6 +178,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r
        { OUI_CABLE_BPDU,  "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
        { OUI_APPLE_ATALK, "Apple (AppleTalk)" },
        { OUI_NORTEL,      "Nortel Networks SONMP" },
+       { OUI_HP,          "Hewlett-Packard" },
        { 0,               NULL }
 };
 

diff --git a/oui.h b/oui.h
index 5aea27a11fba9c35c46a48e2f455b2707d94ef6b..e3b77a5f25ea40e85f91a9f74f49dbfdec01c948 100644 (file)
--- a/oui.h
+++ b/oui.h
@@ -4,10 +4,9 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 - 2000 Gerald Combs
  *
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -35,6 +34,7 @@
 #define        OUI_ATM_FORUM   0x00A03E        /* ATM Forum */
 #define OUI_CABLE_BPDU 0x00E02F        /* DOCSIS spanning tree BPDU */
 #define        OUI_APPLE_ATALK 0x080007        /* Appletalk */
+#define        OUI_HP          0x080009        /* Hewlett-Packard */
 
 extern const value_string oui_vals[];