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.

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.

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 */
+#endif
 
-#include "bpfilter.h"
+static int loioctl(struct ifnet *, u_long, caddr_t);
+static void lortrequest(int, struct rtentry *, struct sockaddr *);
 
-static int loioctl __P((struct ifnet *, int, caddr_t));
-static void lortrequest __P((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;
 	}

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];