This commit fixes various 64bit portability problems required for

FreeBSD/alpha.  The most significant item is to change the command
argument to ioctl functions from int to u_long.  This change brings us
inline with various other BSD versions.  Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.

The prototype FreeBSD/alpha machdep will follow in a couple of days
time.

10 files changed, 35 insertions, 33 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 1b8ae26..136edf0 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.37 1998/01/24 02:54:37 eivind Exp $
+ * $Id: bpf.c,v 1.38 1998/02/20 13:46:57 bde Exp $
  */
 
 #include "bpfilter.h"
@@ -623,7 +623,7 @@ reset_d(d)
 static	int
 bpfioctl(dev, cmd, addr, flags, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t addr;
 	int flags;
 	struct proc *p;
diff --git a/sys/net/if.c b/sys/net/if.c
index 1bedc1d..5030b3f 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.57 1997/12/16 17:40:34 eivind Exp $
+ *	$Id: if.c,v 1.58 1998/04/06 11:43:10 phk Exp $
  */
 
 #include "opt_compat.h"
@@ -57,7 +57,7 @@
  * System initialization
  */
 
-static int ifconf __P((int, caddr_t));
+static int ifconf __P((u_long, caddr_t));
 static void ifinit __P((void *));
 static void if_qflush __P((struct ifqueue *));
 static void if_slowtimo __P((void *));
@@ -522,7 +522,7 @@ ifunit(name)
 int
 ifioctl(so, cmd, data, p)
 	struct socket *so;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	struct proc *p;
 {
@@ -768,7 +768,7 @@ ifpromisc(ifp, pswitch)
 /*ARGSUSED*/
 static int
 ifconf(cmd, data)
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 {
 	register struct ifconf *ifc = (struct ifconf *)data;
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 483ed77..796061e 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.18 1997/08/02 14:32:36 bde Exp $
+ *	$Id: if_disc.c,v 1.19 1998/01/08 23:41:21 eivind Exp $
  */
 
 /*
@@ -67,7 +67,7 @@ static struct	ifnet dsif;
 static int dsoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
 		    struct rtentry *);
 static void dsrtrequest(int cmd, struct rtentry *rt, struct sockaddr *sa);
-static int dsioctl(struct ifnet *, int, caddr_t);
+static int dsioctl(struct ifnet *, u_long, caddr_t);
 
 /* ARGSUSED */
 static void
@@ -153,7 +153,7 @@ dsrtrequest(cmd, rt, sa)
 static int
 dsioctl(ifp, cmd, data)
 	register struct ifnet *ifp;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 {
 	register struct ifaddr *ifa;
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 8da57de..f594525 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.30 1998/01/09 00:51:57 eivind Exp $
+ * $Id: if_loop.c,v 1.31 1998/04/30 19:37:00 phk Exp $
  */
 
 /*
@@ -84,7 +84,7 @@
 
 #include "bpfilter.h"
 
-static int loioctl __P((struct ifnet *, int, caddr_t));
+static int loioctl __P((struct ifnet *, u_long, caddr_t));
 static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
 
 static void loopattach __P((void *));
@@ -248,7 +248,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;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index bf43b64..8bbec24 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.56 1998/04/06 11:43:10 phk Exp $ */
+/* $Id: if_ppp.c,v 1.57 1998/05/19 14:04:09 dg Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
@@ -129,7 +129,9 @@
 #include <net/if_pppvar.h>
 
 /* minimise diffs */
+#ifndef splsoftnet
 #define splsoftnet	splnet
+#endif
 
 #ifdef PPP_COMPRESS
 #define PACKETPTR	struct mbuf *
@@ -144,7 +146,7 @@ extern void	pppasyncattach __P((void *));
 static void	pppattach __P((void *));
 PSEUDO_SET(pppattach, if_ppp);
 
-static int	pppsioctl __P((struct ifnet *ifp, int cmd, caddr_t data));
+static int	pppsioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data));
 static void	pppintr __P((void));
 
 static void	ppp_requeue __P((struct ppp_softc *));
@@ -347,7 +349,7 @@ pppdealloc(sc)
 int
 pppioctl(sc, cmd, data, flag, p)
     struct ppp_softc *sc;
-    int cmd;
+    u_long cmd;
     caddr_t data;
     int flag;
     struct proc *p;
@@ -563,7 +565,7 @@ pppioctl(sc, cmd, data, flag, p)
 static int
 pppsioctl(ifp, cmd, data)
     register struct ifnet *ifp;
-    int cmd;
+    u_long cmd;
     caddr_t data;
 {
     struct proc *p = curproc;	/* XXX */
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 31d6ff5..c764daf 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -39,7 +39,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_pppvar.h,v 1.11 1997/10/17 21:50:32 roberto Exp $
+ * $Id: if_pppvar.h,v 1.12 1997/10/18 00:46:10 peter Exp $
  */
 
 /*
@@ -102,7 +102,7 @@ extern struct ppp_softc ppp_softc[NPPP];
 
 struct	ppp_softc *pppalloc __P((pid_t pid));
 void	pppdealloc __P((struct ppp_softc *sc));
-int	pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data,
+int	pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
 		      int flag, struct proc *p));
 int	pppoutput __P((struct ifnet *ifp, struct mbuf *m0,
 		       struct sockaddr *dst, struct rtentry *rtp));
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 1b0cc01..fc83a485 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.67 1998/02/13 12:46:14 phk Exp $
+ * $Id: if_sl.c,v 1.68 1998/03/30 09:52:00 phk Exp $
  */
 
 /*
@@ -187,8 +187,8 @@ static timeout_t sl_keepalive;
 static timeout_t sl_outfill;
 static int	slclose __P((struct tty *,int));
 static int	slinput __P((int, struct tty *));
-static int	slioctl __P((struct ifnet *, int, caddr_t));
-static int	sltioctl __P((struct tty *, int, caddr_t, int, struct proc *));
+static int	slioctl __P((struct ifnet *, u_long, caddr_t));
+static int	sltioctl __P((struct tty *, u_long, caddr_t, int, struct proc *));
 static int	slopen __P((dev_t, struct tty *));
 static int	sloutput __P((struct ifnet *,
 	    struct mbuf *, struct sockaddr *, struct rtentry *));
@@ -361,7 +361,7 @@ slclose(tp,flag)
 static int
 sltioctl(tp, cmd, data, flag, p)
 	struct tty *tp;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
@@ -747,7 +747,7 @@ sl_btom(sc, len)
 		}
 		sc->sc_ep = mtod(m, u_char *) + SLBUFSIZE;
 		m->m_data = (caddr_t)sc->sc_buf;
-		m->m_ext.ext_buf = (caddr_t)((int)sc->sc_buf &~ MCLOFSET);
+		m->m_ext.ext_buf = (caddr_t)((long)sc->sc_buf &~ MCLOFSET);
 	} else
 		bcopy((caddr_t)sc->sc_buf, mtod(m, caddr_t), len);
 
@@ -941,7 +941,7 @@ newpack:
 static int
 slioctl(ifp, cmd, data)
 	register struct ifnet *ifp;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 {
 	register struct ifaddr *ifa = (struct ifaddr *)data;
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 4b7b29c..e00ce0c 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -78,7 +78,7 @@ static struct tun_softc tunctl[NTUN];
 
 static int tunoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
 	    struct rtentry *rt));
-static int tunifioctl __P((struct ifnet *, int, caddr_t));
+static int tunifioctl __P((struct ifnet *, u_long, caddr_t));
 static int tuninit __P((int));
 
 static	d_open_t	tunopen;
@@ -260,7 +260,7 @@ tuninit(unit)
 int
 tunifioctl(ifp, cmd, data)
 	struct ifnet *ifp;
-	int	cmd;
+	u_long	cmd;
 	caddr_t	data;
 {
 	register struct ifreq *ifr = (struct ifreq *)data;
@@ -388,7 +388,7 @@ tunoutput(ifp, m0, dst, rt)
 static	int
 tunioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 69036d1..f01dac3 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if_var.h,v 1.6 1997/08/28 01:17:09 julian Exp $
+ *	$Id: if_var.h,v 1.7 1998/04/15 17:46:44 bde Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
@@ -121,7 +121,7 @@ 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));
+		__P((struct ifnet *, u_long, caddr_t));
 	void	(*if_watchdog)		/* timer routine */
 		__P((struct ifnet *));
 	int	(*if_poll_recv)		/* polled receive routine */
@@ -305,7 +305,7 @@ void	if_up __P((struct ifnet *));
 void	ifubareset __P((int));
 #endif
 /*void	ifinit __P((void));*/ /* declared in systm.h for main() */
-int	ifioctl __P((struct socket *, int, caddr_t, struct proc *));
+int	ifioctl __P((struct socket *, u_long, caddr_t, struct proc *));
 int	ifpromisc __P((struct ifnet *, int));
 struct	ifnet *ifunit __P((char *));
 
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 6042d20..6cfbf18 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.34 1998/04/15 17:46:46 bde Exp $ */
+/* $Id: ppp_tty.c,v 1.35 1998/05/01 16:40:21 bde Exp $ */
 
 #include "ppp.h"
 #if NPPP > 0
@@ -112,7 +112,7 @@ static int	pppopen __P((dev_t dev, struct tty *tp));
 static int	pppclose __P((struct tty *tp, int flag));
 static int	pppread __P((struct tty *tp, struct uio *uio, int flag));
 static int	pppwrite __P((struct tty *tp, struct uio *uio, int flag));
-static int	ppptioctl __P((struct tty *tp, int cmd, caddr_t data, int flag,
+static int	ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, int flag,
 		       struct proc *));
 static int	pppinput __P((int c, struct tty *tp));
 static int	pppstart __P((struct tty *tp));
@@ -465,7 +465,7 @@ pppwrite(tp, uio, flag)
 static int
 ppptioctl(tp, cmd, data, flag, p)
     struct tty *tp;
-    int cmd;
+    u_long cmd;
     caddr_t data;
     int flag;
     struct proc *p;