2005-04-18 Ralf Corsepius <ralf.corsepius@rtems.org>

	* libnetworking/net/if.h: Update from FreeBSD.
	* libnetworking/net/if_loop.c: Reflect updates.
	* libnetworking/net/if_ppp.c: Reflect updates.
	* libnetworking/net/if_types.h: Update from FreeBSD.

5 files changed, 198 insertions, 272 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d71de79f61..e1c10e6f72 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,9 @@
 2005-04-18	Ralf Corsepius <ralf.corsepius@rtems.org>
 
+	* libnetworking/net/if.h: Update from FreeBSD.
+	* libnetworking/net/if_loop.c: Reflect updates.
+	* libnetworking/net/if_ppp.c: Reflect updates.
+	* libnetworking/net/if_types.h: Update from FreeBSD.
 	* libnetworking/net/ethernet.h: Add RTEMS outdated either_input.
 	* libnetworking/net/if.c: Partial update from FreeBSD.
 	* libnetworking/net/if_ethersubr.c: Partial update from FreeBSD.
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/net/if.h
index efe9bbeff8..22f60a6069 100644
--- a/cpukit/libnetworking/net/if.h
+++ b/cpukit/libnetworking/net/if.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if.h,v 1.92 2004/09/08 04:50:55 brooks Exp $
+ * $FreeBSD: src/sys/net/if.h,v 1.95 2005/02/25 19:46:41 brooks Exp $
  */
 
 /*
@@ -37,31 +37,6 @@
 #ifndef _NET_IF_H_
 #define	_NET_IF_H_
 
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
 #include <sys/cdefs.h>
 
 #if defined(__rtems__)
@@ -88,14 +63,6 @@
 #endif
 
 struct ifnet;
-
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	proc;
-struct	rtentry;
-struct	socket;
 struct	ether_header;
 #endif
 
@@ -152,89 +119,6 @@ struct if_data {
 	struct	timeval ifi_lastchange;	/* time of last administrative change */
 };
 
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	struct	ifnet *if_next;		/* all struct ifnets are chained */
-	struct	ifaddr *if_addrlist;	/* linked list of addresses per if */
-        int	if_pcount;		/* number of promiscuous listeners */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_timer;		/* time 'til if_watchdog called */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_ipending;		/* interrupts pending */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		__P((struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *));
-	void	(*if_start)		/* initiate output routine */
-		__P((struct ifnet *));
-	int	(*if_done)		/* output complete routine */
-		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
-	int	(*if_ioctl)		/* ioctl routine */
-		__P((struct ifnet *, int, caddr_t));
-	void	(*if_watchdog)		/* timer routine */
-		__P((struct ifnet *));
-	int	(*if_poll_recv)		/* polled receive routine */
-		__P((struct ifnet *, int *));
-	int	(*if_poll_xmit)		/* polled transmit routine */
-		__P((struct ifnet *, int *));
-	void	(*if_poll_intren)	/* polled interrupt reenable routine */
-		__P((struct ifnet *));
-	void	(*if_poll_slowinput)	/* input routine for slow devices */
-		__P((struct ifnet *, struct mbuf *));
-	void	(*if_init)		/* Init routine */
-		__P((void *));
-	int	(*if_tap)		/* Packet filter routine */
-		(struct ifnet *, struct ether_header *, struct mbuf *);
-	struct	ifqueue if_snd;		/* output queue */
-	struct	ifqueue *if_poll_slowq;	/* input queue for slow devices */
-};
-typedef void if_init_f_t __P((void *));       
-
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-#define if_recvquota	if_data.ifi_recvquota
-#define	if_xmitquota	if_data.ifi_xmitquota
-#define if_rawoutput(if, m, sa) if_output(if, m, sa, (struct rtentry *)0)
-
 #define	IFF_UP		0x1		/* interface is up */
 #define	IFF_BROADCAST	0x2		/* broadcast address valid */
 #define	IFF_DEBUG	0x4		/* turn on debugging */
@@ -264,15 +148,20 @@ typedef void if_init_f_t __P((void *));
 	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\
 	    IFF_POLLING)
 
+/*
+ * Values for if_link_state.
+ */
+#define	LINK_STATE_UNKNOWN	0	/* link invalid/unknown */
+#define	LINK_STATE_DOWN		1	/* link is down */
+#define	LINK_STATE_UP		2	/* link is up */
 
 /*
- * These really don't belong here, but there's no other obviously appropriate
- * location.
+ * Some convenience macros used for setting ifi_baudrate.
+ * XXX 1000 vs. 1024? --thorpej@netbsd.org
  */
-#define IFP_AUI		0
-#define IFP_10BASE2	1
-#define IFP_10BASET	2
-/* etc. */
+#define	IF_Kbps(x)	((x) * 1000)		/* kilobits/sec. */
+#define	IF_Mbps(x)	(IF_Kbps((x) * 1000))	/* megabits/sec. */
+#define	IF_Gbps(x)	(IF_Mbps((x) * 1000))	/* gigabits/sec. */
 
 /*
  * Bit values in if_ipending
@@ -280,103 +169,10 @@ typedef void if_init_f_t __P((void *));
 #define	IFI_RECV	1	/* I want to receive */
 #define	IFI_XMIT	2	/* I want to transmit */
 
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros, which should be called with ipl raised to splimp().
- */
-#define	IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	IF_ENQUEUE(ifq, m) { \
-/* printf(" IF_ENQUEUE: %p %p\n", ifq, m ); */ \
-	(m)->m_nextpkt = 0; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_head = m; \
-	else \
-		(ifq)->ifq_tail->m_nextpkt = m; \
-	(ifq)->ifq_tail = m; \
-	(ifq)->ifq_len++; \
-}
-#define	IF_PREPEND(ifq, m) { \
-/* printf(" IF_PREPEND: %p %p\n", ifq, m ); */ \
-	(m)->m_nextpkt = (ifq)->ifq_head; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_tail = (m); \
-	(ifq)->ifq_head = (m); \
-	(ifq)->ifq_len++; \
-}
-#define	IF_DEQUEUE(ifq, m) { \
-	(m) = (ifq)->ifq_head; \
-	if (m) { \
-/* printf(" IF_DEQUEUE: %p %p\n", ifq, m ); */ \
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \
-			(ifq)->ifq_tail = 0; \
-		(m)->m_nextpkt = 0; \
-		(ifq)->ifq_len--; \
-	} \
-}
-
-#ifdef _KERNEL
-#define	IF_ENQ_DROP(ifq, m)	if_enq_drop(ifq, m)
-
-#if defined(__GNUC__) && defined(MT_HEADER)
-static inline int
-if_queue_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	IF_DROP(ifq);
-	return 0;
-}
-
-static inline int
-if_enq_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	if (IF_QFULL(ifq) &&
-	    !if_queue_drop(ifq, m))
-		return 0;
-	IF_ENQUEUE(ifq, m);
-	return 1;
-}
-#else
-
-#ifdef MT_HEADER
-int	if_enq_drop __P((struct ifqueue *, struct mbuf *));
-#endif
-
-#endif
-#endif /* _KERNEL */
-
 #define	IFQ_MAXLEN	50
 #define	IFNET_SLOWHZ	1		/* granularity is 1 second */
 
 /*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	struct	ifaddr *ifa_next;	/* next address for interface */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		__P((int, struct rtentry *, struct sockaddr *));
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	short	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-#ifdef notdef
-	struct	rtentry *ifa_rt;	/* XXXX for ROUTETOIF ????? */
-#endif
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		__P((struct ifaddr *, struct sockaddr *));
-
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-
-/*
  * Message format for use in obtaining information about interfaces
  * from getkerninfo and the routing socket
  */
@@ -483,45 +279,15 @@ struct	ifconf {
 };
 #endif /* __BSD_VISIBLE */
 
-#include <net/if_arp.h>
-
 #ifdef _KERNEL
-#define	IFAFREE(ifa) \
-	if ((ifa)->ifa_refcnt <= 0) \
-		ifafree(ifa); \
-	else \
-		(ifa)->ifa_refcnt--;
 
-extern struct	ifnet	*ifnet;
-extern int	ifqmaxlen;
-extern struct	ifnet	loif[];
-extern int	if_index;
-extern struct	ifaddr	**ifnet_addrs;
+/* XXX - this should go away soon. */
+#include <net/if_var.h>
 
-void	ether_ifattach __P((struct ifnet *));
-void	ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *));
-int	ether_output __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-int	ether_ioctl __P((struct ifnet *, int , caddr_t ));
-
-void	if_attach(struct ifnet *);
-void	if_down(struct ifnet *);
-void	if_up(struct ifnet *);
-
-/*void	ifinit __P((void));*/ /* declared in systm.h for main() */
-int	ifioctl(struct socket *, int, caddr_t, struct proc *);
-int	ifpromisc(struct ifnet *, int);
-
-struct	ifaddr *ifa_ifwithaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithnet(struct sockaddr *);
-struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *,
-					struct sockaddr *);
-struct	ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *));
 void	ifafree __P((struct ifaddr *));
 
 int	looutput __P((struct ifnet *,
 	   struct mbuf *, struct sockaddr *, struct rtentry *));
-#endif /* _KERNEL */
+#endif
 
 #endif /* !_NET_IF_H_ */
diff --git a/cpukit/libnetworking/net/if_loop.c b/cpukit/libnetworking/net/if_loop.c
index d0c63f58cf..c84abd9ded 100644
--- a/cpukit/libnetworking/net/if_loop.c
+++ b/cpukit/libnetworking/net/if_loop.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/if_loop.c,v 1.102 2004/08/27 18:33:07 andre Exp $
+ * $FreeBSD: src/sys/net/if_loop.c,v 1.104 2005/02/24 01:34:01 sam Exp $
  */
 
 /*
@@ -83,14 +83,12 @@
 #ifdef NETATALK
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
-#endif /* NETATALK */
-
-#include "bpfilter.h"
+#endif
 
-static int loioctl __P((struct ifnet *, int, caddr_t));
-static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
+static int loioctl(struct ifnet *, u_long, caddr_t);
+static void lortrequest(int, struct rtentry *, struct sockaddr *);
 
-       void rtems_bsdnet_loopattach __P((void *));
+       void rtems_bsdnet_loopattach(void *);
 PSEUDO_SET(loopattach, if_loop);
 
 #ifdef TINY_LOMTU
@@ -246,7 +244,7 @@ lortrequest(cmd, rt, sa)
 static int
 loioctl(ifp, cmd, data)
 	register struct ifnet *ifp;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 {
 	register struct ifaddr *ifa;
@@ -276,6 +274,10 @@ loioctl(ifp, cmd, data)
 		case AF_INET:
 			break;
 #endif
+#ifdef INET6
+		case AF_INET6:
+			break;
+#endif
 
 		default:
 			error = EAFNOSUPPORT;
@@ -287,6 +289,9 @@ loioctl(ifp, cmd, data)
 		ifp->if_mtu = ifr->ifr_mtu;
 		break;
 
+	case SIOCSIFFLAGS:
+		break;
+
 	default:
 		error = EINVAL;
 	}
diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c
index 45ff18d9f0..3e617a423f 100644
--- a/cpukit/libnetworking/net/if_ppp.c
+++ b/cpukit/libnetworking/net/if_ppp.c
@@ -127,7 +127,7 @@
 #include <net/ppp-comp.h>
 #endif
 
-static int	pppsioctl(struct ifnet *, int, caddr_t);
+static int	pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void	ppp_requeue(struct ppp_softc *);
 #ifdef PPP_COMPRESS
 static void	ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd);
@@ -833,10 +833,7 @@ pppioctl(sc, cmd, data, flag, p)
  * Process an ioctl request to the ppp network interface.
  */
 static int
-pppsioctl(ifp, cmd, data)
-    register struct ifnet *ifp;
-    int cmd;
-    caddr_t data;
+pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
     /*struct proc *p = curproc;*/	/* XXX */
     register struct ppp_softc *sc = &ppp_softc[ifp->if_unit];
diff --git a/cpukit/libnetworking/net/if_types.h b/cpukit/libnetworking/net/if_types.h
index 833ba471c3..478c419761 100644
--- a/cpukit/libnetworking/net/if_types.h
+++ b/cpukit/libnetworking/net/if_types.h
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -30,7 +26,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
+ *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
+ * $FreeBSD: src/sys/net/if_types.h,v 1.18 2005/02/22 13:04:03 glebius Exp $
+ * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
+ */
+
+/*
  * $Id$
  */
 
@@ -39,8 +40,10 @@
 
 /*
  * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, currently
- * documented in RFC1573.
+ * This list is derived from the SNMP list of ifTypes, originally
+ * documented in RFC1573, now maintained as:
+ *
+ * 	ftp.isi.edu/in-notes/iana/assignments/smi-numbers
  */
 
 #define	IFT_OTHER	0x1		/* none of the following */
@@ -48,8 +51,8 @@
 #define	IFT_HDH1822	0x3		/* HDH arpanet imp */
 #define	IFT_X25DDN	0x4		/* x25 to imp */
 #define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMACD */
-#define	IFT_ISO88023	0x7		/* CMSA CD */
+#define	IFT_ETHER	0x6		/* Ethernet CSMA/CD */
+#define	IFT_ISO88023	0x7		/* CMSA/CD */
 #define	IFT_ISO88024	0x8		/* Token Bus */
 #define	IFT_ISO88025	0x9		/* Token Ring */
 #define	IFT_ISO88026	0xa		/* MAN */
@@ -97,5 +100,156 @@
 #define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
 #define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
 #define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
+#define	IFT_IEEE80212		   0x37 /* 100BaseVG */
+#define	IFT_FIBRECHANNEL	   0x38 /* Fibre Channel */
+#define	IFT_HIPPIINTERFACE	   0x39 /* HIPPI interfaces	 */
+#define	IFT_FRAMERELAYINTERCONNECT 0x3a /* Obsolete, use either 0x20 or 0x2c */
+#define	IFT_AFLANE8023		   0x3b /* ATM Emulated LAN for 802.3 */
+#define	IFT_AFLANE8025		   0x3c /* ATM Emulated LAN for 802.5 */
+#define	IFT_CCTEMUL		   0x3d /* ATM Emulated circuit		  */
+#define	IFT_FASTETHER		   0x3e /* Fast Ethernet (100BaseT) */
+#define	IFT_ISDN		   0x3f /* ISDN and X.25	    */
+#define	IFT_V11			   0x40 /* CCITT V.11/X.21		*/
+#define	IFT_V36			   0x41 /* CCITT V.36			*/
+#define	IFT_G703AT64K		   0x42 /* CCITT G703 at 64Kbps */
+#define	IFT_G703AT2MB		   0x43 /* Obsolete see DS1-MIB */
+#define	IFT_QLLC		   0x44 /* SNA QLLC			*/
+#define	IFT_FASTETHERFX		   0x45 /* Fast Ethernet (100BaseFX)	*/
+#define	IFT_CHANNEL		   0x46 /* channel			*/
+#define	IFT_IEEE80211		   0x47 /* radio spread spectrum	*/
+#define	IFT_IBM370PARCHAN	   0x48 /* IBM System 360/370 OEMI Channel */
+#define	IFT_ESCON		   0x49 /* IBM Enterprise Systems Connection */
+#define	IFT_DLSW		   0x4a /* Data Link Switching */
+#define	IFT_ISDNS		   0x4b /* ISDN S/T interface */
+#define	IFT_ISDNU		   0x4c /* ISDN U interface */
+#define	IFT_LAPD		   0x4d /* Link Access Protocol D */
+#define	IFT_IPSWITCH		   0x4e /* IP Switching Objects */
+#define	IFT_RSRB		   0x4f /* Remote Source Route Bridging */
+#define	IFT_ATMLOGICAL		   0x50 /* ATM Logical Port */
+#define	IFT_DS0			   0x51 /* Digital Signal Level 0 */
+#define	IFT_DS0BUNDLE		   0x52 /* group of ds0s on the same ds1 */
+#define	IFT_BSC			   0x53 /* Bisynchronous Protocol */
+#define	IFT_ASYNC		   0x54 /* Asynchronous Protocol */
+#define	IFT_CNR			   0x55 /* Combat Net Radio */
+#define	IFT_ISO88025DTR		   0x56 /* ISO 802.5r DTR */
+#define	IFT_EPLRS		   0x57 /* Ext Pos Loc Report Sys */
+#define	IFT_ARAP		   0x58 /* Appletalk Remote Access Protocol */
+#define	IFT_PROPCNLS		   0x59 /* Proprietary Connectionless Protocol*/
+#define	IFT_HOSTPAD		   0x5a /* CCITT-ITU X.29 PAD Protocol */
+#define	IFT_TERMPAD		   0x5b /* CCITT-ITU X.3 PAD Facility */
+#define	IFT_FRAMERELAYMPI	   0x5c /* Multiproto Interconnect over FR */
+#define	IFT_X213		   0x5d /* CCITT-ITU X213 */
+#define	IFT_ADSL		   0x5e /* Asymmetric Digital Subscriber Loop */
+#define	IFT_RADSL		   0x5f /* Rate-Adapt. Digital Subscriber Loop*/
+#define	IFT_SDSL		   0x60 /* Symmetric Digital Subscriber Loop */
+#define	IFT_VDSL		   0x61 /* Very H-Speed Digital Subscrib. Loop*/
+#define	IFT_ISO88025CRFPINT	   0x62 /* ISO 802.5 CRFP */
+#define	IFT_MYRINET		   0x63 /* Myricom Myrinet */
+#define	IFT_VOICEEM		   0x64 /* voice recEive and transMit */
+#define	IFT_VOICEFXO		   0x65 /* voice Foreign Exchange Office */
+#define	IFT_VOICEFXS		   0x66 /* voice Foreign Exchange Station */
+#define	IFT_VOICEENCAP		   0x67 /* voice encapsulation */
+#define	IFT_VOICEOVERIP		   0x68 /* voice over IP encapsulation */
+#define	IFT_ATMDXI		   0x69 /* ATM DXI */
+#define	IFT_ATMFUNI		   0x6a /* ATM FUNI */
+#define	IFT_ATMIMA		   0x6b /* ATM IMA		      */
+#define	IFT_PPPMULTILINKBUNDLE	   0x6c /* PPP Multilink Bundle */
+#define	IFT_IPOVERCDLC		   0x6d /* IBM ipOverCdlc */
+#define	IFT_IPOVERCLAW		   0x6e /* IBM Common Link Access to Workstn */
+#define	IFT_STACKTOSTACK	   0x6f /* IBM stackToStack */
+#define	IFT_VIRTUALIPADDRESS	   0x70 /* IBM VIPA */
+#define	IFT_MPC			   0x71 /* IBM multi-protocol channel support */
+#define	IFT_IPOVERATM		   0x72 /* IBM ipOverAtm */
+#define	IFT_ISO88025FIBER	   0x73 /* ISO 802.5j Fiber Token Ring */
+#define	IFT_TDLC		   0x74 /* IBM twinaxial data link control */
+#define	IFT_GIGABITETHERNET	   0x75 /* Gigabit Ethernet */
+#define	IFT_HDLC		   0x76 /* HDLC */
+#define	IFT_LAPF		   0x77 /* LAP F */
+#define	IFT_V37			   0x78 /* V.37 */
+#define	IFT_X25MLP		   0x79 /* Multi-Link Protocol */
+#define	IFT_X25HUNTGROUP	   0x7a /* X25 Hunt Group */
+#define	IFT_TRANSPHDLC		   0x7b /* Transp HDLC */
+#define	IFT_INTERLEAVE		   0x7c /* Interleave channel */
+#define	IFT_FAST		   0x7d /* Fast channel */
+#define	IFT_IP			   0x7e /* IP (for APPN HPR in IP networks) */
+#define	IFT_DOCSCABLEMACLAYER	   0x7f /* CATV Mac Layer */
+#define	IFT_DOCSCABLEDOWNSTREAM	   0x80 /* CATV Downstream interface */
+#define	IFT_DOCSCABLEUPSTREAM	   0x81 /* CATV Upstream interface */
+#define	IFT_A12MPPSWITCH	   0x82	/* Avalon Parallel Processor */
+#define	IFT_TUNNEL		   0x83	/* Encapsulation interface */
+#define	IFT_COFFEE		   0x84	/* coffee pot */
+#define	IFT_CES			   0x85	/* Circiut Emulation Service */
+#define	IFT_ATMSUBINTERFACE	   0x86	/* (x)  ATM Sub Interface */
+#define	IFT_L2VLAN		   0x87	/* Layer 2 Virtual LAN using 802.1Q */
+#define	IFT_L3IPVLAN		   0x88	/* Layer 3 Virtual LAN - IP Protocol */
+#define	IFT_L3IPXVLAN		   0x89	/* Layer 3 Virtual LAN - IPX Prot. */
+#define	IFT_DIGITALPOWERLINE	   0x8a	/* IP over Power Lines */
+#define	IFT_MEDIAMAILOVERIP	   0x8b	/* (xxx)  Multimedia Mail over IP */
+#define	IFT_DTM			   0x8c	/* Dynamic synchronous Transfer Mode */
+#define	IFT_DCN			   0x8d	/* Data Communications Network */
+#define	IFT_IPFORWARD		   0x8e	/* IP Forwarding Interface */
+#define	IFT_MSDSL		   0x8f	/* Multi-rate Symmetric DSL */
+#define	IFT_IEEE1394		   0x90	/* IEEE1394 High Performance SerialBus*/
+#define	IFT_IFGSN		   0x91	/* HIPPI-6400 */
+#define	IFT_DVBRCCMACLAYER	   0x92	/* DVB-RCC MAC Layer */
+#define	IFT_DVBRCCDOWNSTREAM	   0x93	/* DVB-RCC Downstream Channel */
+#define	IFT_DVBRCCUPSTREAM	   0x94	/* DVB-RCC Upstream Channel */
+#define	IFT_ATMVIRTUAL		   0x95	/* ATM Virtual Interface */
+#define	IFT_MPLSTUNNEL		   0x96	/* MPLS Tunnel Virtual Interface */
+#define	IFT_SRP			   0x97	/* Spatial Reuse Protocol */
+#define	IFT_VOICEOVERATM	   0x98	/* Voice over ATM */
+#define	IFT_VOICEOVERFRAMERELAY	   0x99	/* Voice Over Frame Relay */
+#define	IFT_IDSL		   0x9a	/* Digital Subscriber Loop over ISDN */
+#define	IFT_COMPOSITELINK	   0x9b	/* Avici Composite Link Interface */
+#define	IFT_SS7SIGLINK		   0x9c	/* SS7 Signaling Link */
+#define	IFT_PROPWIRELESSP2P	   0x9d	/* Prop. P2P wireless interface */
+#define	IFT_FRFORWARD		   0x9e	/* Frame forward Interface */
+#define	IFT_RFC1483		   0x9f	/* Multiprotocol over ATM AAL5 */
+#define	IFT_USB			   0xa0	/* USB Interface */
+#define	IFT_IEEE8023ADLAG	   0xa1	/* IEEE 802.3ad Link Aggregate*/
+#define	IFT_BGPPOLICYACCOUNTING	   0xa2	/* BGP Policy Accounting */
+#define	IFT_FRF16MFRBUNDLE	   0xa3	/* FRF.16 Multilik Frame Relay*/
+#define	IFT_H323GATEKEEPER	   0xa4	/* H323 Gatekeeper */
+#define	IFT_H323PROXY		   0xa5	/* H323 Voice and Video Proxy */
+#define	IFT_MPLS		   0xa6	/* MPLS */
+#define	IFT_MFSIGLINK		   0xa7	/* Multi-frequency signaling link */
+#define	IFT_HDSL2		   0xa8	/* High Bit-Rate DSL, 2nd gen. */
+#define	IFT_SHDSL		   0xa9	/* Multirate HDSL2 */
+#define	IFT_DS1FDL		   0xaa	/* Facility Data Link (4Kbps) on a DS1*/
+#define	IFT_POS			   0xab	/* Packet over SONET/SDH Interface */
+#define	IFT_DVBASILN		   0xac	/* DVB-ASI Input */
+#define	IFT_DVBASIOUT		   0xad	/* DVB-ASI Output */
+#define	IFT_PLC			   0xae	/* Power Line Communications */
+#define	IFT_NFAS		   0xaf	/* Non-Facility Associated Signaling */
+#define	IFT_TR008		   0xb0	/* TROO8 */
+#define	IFT_GR303RDT		   0xb1	/* Remote Digital Terminal */
+#define	IFT_GR303IDT		   0xb2	/* Integrated Digital Terminal */
+#define	IFT_ISUP		   0xb3	/* ISUP */
+#define	IFT_PROPDOCSWIRELESSMACLAYER	   0xb4	/* prop/Wireless MAC Layer */
+#define	IFT_PROPDOCSWIRELESSDOWNSTREAM	   0xb5	/* prop/Wireless Downstream */
+#define	IFT_PROPDOCSWIRELESSUPSTREAM	   0xb6	/* prop/Wireless Upstream */
+#define	IFT_HIPERLAN2		   0xb7	/* HIPERLAN Type 2 Radio Interface */
+#define	IFT_PROPBWAP2MP		   0xb8	/* PropBroadbandWirelessAccess P2MP*/
+#define	IFT_SONETOVERHEADCHANNEL   0xb9	/* SONET Overhead Channel */
+#define	IFT_DIGITALWRAPPEROVERHEADCHANNEL  0xba	/* Digital Wrapper Overhead */
+#define	IFT_AAL2		   0xbb	/* ATM adaptation layer 2 */
+#define	IFT_RADIOMAC		   0xbc	/* MAC layer over radio links */
+#define	IFT_ATMRADIO		   0xbd	/* ATM over radio links */
+#define	IFT_IMT			   0xbe /* Inter-Machine Trunks */
+#define	IFT_MVL			   0xbf /* Multiple Virtual Lines DSL */
+#define	IFT_REACHDSL		   0xc0 /* Long Reach DSL */
+#define	IFT_FRDLCIENDPT		   0xc1 /* Frame Relay DLCI End Point */
+#define	IFT_ATMVCIENDPT		   0xc2 /* ATM VCI End Point */
+#define	IFT_OPTICALCHANNEL	   0xc3 /* Optical Channel */
+#define	IFT_OPTICALTRANSPORT	   0xc4 /* Optical Transport */
+
+#define	IFT_STF			   0xd7	/* 6to4 interface */
 
-#endif
+/* not based on IANA assignments */
+#define	IFT_GIF		0xf0
+#define	IFT_PVC		0xf1
+#define	IFT_FAITH	0xf2
+#define	IFT_PFLOG	0xf6
+#define	IFT_PFSYNC	0xf7
+#define	IFT_CARP	0xf8	/* Common Address Redundancy Protocol */
+#endif /* !_NET_IF_TYPES_H_ */