diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index f826ba081..daab6938d 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -95,6 +96,7 @@ static int do_chflags(char *dev, __u32 flags, __u32 mask) static int do_changename(char *dev, char *newdev) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) struct ifreq ifr; int fd; int err; @@ -112,6 +114,8 @@ static int do_changename(char *dev, char *newdev) } close(fd); return err; +#endif + return 0; } static int set_qlen(char *dev, int qlen) diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index 04411931d..9390e56fb 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -18,6 +18,8 @@ #include #include +#include + #include "libnetlink.h" #include "libbb.h" diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index d7b1dedfc..cfdb34e38 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c @@ -51,10 +51,18 @@ __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) @@ -70,7 +78,9 @@ __PF(TR_802_2,tr_802_2) __PF(MOBITEX,mobitex) __PF(CONTROL,control) __PF(IRDA,irda) +#ifdef ETH_P_ECONET __PF(ECONET,econet) +#endif { 0x8100, "802.1Q" }, { ETH_P_IP, "ipv4" }, diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index 925d60ddc..f39f777e1 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c @@ -34,7 +34,9 @@ __PF(IEEE802,tr) __PF(ARCNET,arcnet) __PF(APPLETLK,atalk) __PF(DLCI,dlci) +#ifdef ARPHRD_ATM __PF(ATM,atm) +#endif __PF(METRICOM,metricom) #ifdef ARPHRD_IEEE1394 __PF(IEEE1394,ieee1394) @@ -48,12 +50,16 @@ __PF(RSRVD,rsrvd) __PF(ADAPT,adapt) __PF(ROSE,rose) __PF(X25,x25) +#ifdef ARPHRD_HWX25 __PF(HWX25,hwx25) +#endif __PF(PPP,ppp) __PF(HDLC,hdlc) __PF(LAPB,lapb) +#ifdef ARPHRD_DDCMP __PF(DDCMP,ddcmp) __PF(RAWHDLC,rawhdlc) +#endif __PF(TUNNEL,ipip) __PF(TUNNEL6,tunnel6)