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 cdd1602e35f99a2916a46d817cce2991a07b0869..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>
@@ -30,25 +28,19 @@
 
 
 #define __PF(f,n) { ETH_P_##f, #n },
-static struct {
+static const struct {
        int id;
        const char *name;
 } llproto_names[] = {
 __PF(LOOP,loop)
 __PF(PUP,pup)
-#ifdef ETH_P_PUPAT
 __PF(PUPAT,pupat)
-#endif
 __PF(IP,ip)
 __PF(X25,x25)
 __PF(ARP,arp)
 __PF(BPQ,bpq)
-#ifdef ETH_P_IEEEPUP
 __PF(IEEEPUP,ieeepup)
-#endif
-#ifdef ETH_P_IEEEPUPAT
 __PF(IEEEPUPAT,ieeepupat)
-#endif
 __PF(DEC,dec)
 __PF(DNA_DL,dna_dl)
 __PF(DNA_RC,dna_rc)
@@ -62,19 +54,10 @@ __PF(ATALK,atalk)
 __PF(AARP,aarp)
 __PF(IPX,ipx)
 __PF(IPV6,ipv6)
-#ifdef ETH_P_PPP_DISC
 __PF(PPP_DISC,ppp_disc)
-#endif
-#ifdef ETH_P_PPP_SES
 __PF(PPP_SES,ppp_ses)
-#endif
-#ifdef ETH_P_ATMMPOA
 __PF(ATMMPOA,atmmpoa)
-#endif
-#ifdef ETH_P_ATMFATE
 __PF(ATMFATE,atmfate)
-#endif
-
 __PF(802_3,802_3)
 __PF(AX25,ax25)
 __PF(ALL,all)
@@ -90,13 +73,14 @@ __PF(TR_802_2,tr_802_2)
 __PF(MOBITEX,mobitex)
 __PF(CONTROL,control)
 __PF(IRDA,irda)
-#ifdef ETH_P_ECONET
 __PF(ECONET,econet)
-#endif
 __PF(TIPC,tipc)
 __PF(AOE,aoe)
+__PF(8021Q,802.1Q)
+__PF(8021AD,802.1ad)
 
 { 0x8100, "802.1Q" },
+{ 0x88cc, "LLDP" },
 { ETH_P_IP, "ipv4" },
 };
 #undef __PF
@@ -116,17 +100,16 @@ const char * ll_proto_n2a(unsigned short id, char *buf, int len)
         return buf;
 }
 
-int ll_proto_a2n(unsigned short *id, char *buf)
+int ll_proto_a2n(unsigned short *id, const char *buf)
 {
         int i;
-        for (i=0; i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
+        for (i=0; i < sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
                  if (strcasecmp(llproto_names[i].name, buf) == 0) {
                         *id = htons(llproto_names[i].id);
                         return 0;
                 }
        }
-       if (get_u16(id, buf, 0))
+       if (get_be16(id, buf, 0))
                return -1;
-       *id = htons(*id);
        return 0;
 }