Merge commit 'upstream/1.5'

[ap-utils.git] / lib / oui.c

diff --git a/lib/oui.c b/lib/oui.c
index 5295e1451fe53e38073598f0b2766a81e4e84eb2..b125abd69cb10857ecbcf2a05e3ed7d01607758f 100644 (file)
--- a/lib/oui.c
+++ b/lib/oui.c
@@ -2741,7 +2741,10 @@ char *oui2manufacturer(char *mac)
        0x00, 0x0C, 0xCE, "Cisco Systems"}, {
        0x00, 0x0D, 0x54, "3Com Europe Ltd"}, {
        0x00, 0x0D, 0x88, "D-Link Corporation"}, {
+       0x00, 0x0E, 0x2E, "Edimax Technology Co., Ltd."}, {
        0x00, 0x0E, 0xA6, "ASUSTEK COMPUTER INC."}, {
+       0x00, 0x0F, 0x3D, "D-Link Corporation"}, {
+       0x00, 0x0F, 0x66, "Cisco-Linksys"}, {
        0x00, 0x10, 0x00, "CABLE TELEVISION LABORATIES, INC."}, {
        0x00, 0x10, 0x01, "MCK COMMUNICATIONS"}, {
        0x00, 0x10, 0x02, "ACTIA"}, {
@@ -2998,6 +3001,8 @@ char *oui2manufacturer(char *mac)
        0x00, 0x10, 0xFD, "COCOM A/S"}, {
        0x00, 0x10, 0xFE, "DIGITAL EQUIPMENT CORPORATION"}, {
        0x00, 0x10, 0xFF, "CISCO SYSTEMS, INC."}, {
+       0x00, 0x11, 0x2F, "ASUSTek Computer Inc."}, {
+       0x00, 0x11, 0x7C, "e-zy.net"}, {
        0x00, 0x1C, 0x7C, "PERQ SYSTEMS CORPORATION"}, {
        0x00, 0x20, 0x00, "LEXMARK INTERNATIONAL, INC."}, {
        0x00, 0x20, 0x01, "DSP SOLUTIONS, INC."}, {