Merge branch 'iproute2-master' into next

[mirror_iproute2.git] / lib / ll_proto.c

diff --git a/lib/ll_proto.c b/lib/ll_proto.c
index 3aa825256478a0c77fa001e716df807165fcba00..8316a75539efd603177fafa9b8285b3f3792c43c 100644 (file)
--- a/lib/ll_proto.c
+++ b/lib/ll_proto.c
@@ -12,11 +12,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
@@ -78,6 +76,8 @@ __PF(IRDA,irda)
 __PF(ECONET,econet)
 __PF(TIPC,tipc)
 __PF(AOE,aoe)
+__PF(8021Q,802.1Q)
+__PF(8021AD,802.1ad)
 
 { 0x8100, "802.1Q" },
 { 0x88cc, "LLDP" },
@@ -109,8 +109,7 @@ int ll_proto_a2n(unsigned short *id, const char *buf)
                         return 0;
                 }
        }
-       if (get_u16(id, buf, 0))
+       if (get_be16(id, buf, 0))
                return -1;
-       *id = htons(*id);
        return 0;
 }