Switch cmd argument to u_long. This matches what if_ethersubr.c does and

allows the code to compile cleanly on amd64 with clang.

Reviewed by:	rwatson
Approved by:	ed (mentor)

15 files changed, 17 insertions, 17 deletions

diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 869a8d9..71e3b6f 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -99,7 +99,7 @@ struct fddi_header {
 
 void	fddi_ifattach(struct ifnet *, const u_int8_t *, int);
 void	fddi_ifdetach(struct ifnet *, int);
-int	fddi_ioctl(struct ifnet *, int, caddr_t);
+int	fddi_ioctl(struct ifnet *, u_long, caddr_t);
 
 #endif	/* _KERNEL */
 #endif	/* _NET_FDDI_H_ */
diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index d47b822..bab71a5 100644
--- a/sys/net/firewire.h
+++ b/sys/net/firewire.h
@@ -135,7 +135,7 @@ extern	void	firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src);
 extern	void	firewire_ifattach(struct ifnet *, struct fw_hwaddr *);
 extern	void	firewire_ifdetach(struct ifnet *);
 extern	void	firewire_busreset(struct ifnet *);
-extern	int	firewire_ioctl(struct ifnet *, int, caddr_t);
+extern	int	firewire_ioctl(struct ifnet *, u_long, caddr_t);
 
 #endif /* !_KERNEL */
 
diff --git a/sys/net/if.c b/sys/net/if.c
index 2881612..c5e1a56 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2382,7 +2382,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
 		error = (*ifp->if_ioctl)(ifp, cmd, data);
 #else
 	{
-		int ocmd = cmd;
+		u_long ocmd = cmd;
 
 		switch (cmd) {
 
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h
index 086aeb0f..88a7240 100644
--- a/sys/net/if_arc.h
+++ b/sys/net/if_arc.h
@@ -134,7 +134,7 @@ int	arc_isphds(u_int8_t);
 void	arc_input(struct ifnet *, struct mbuf *);
 int	arc_output(struct ifnet *, struct mbuf *,
 	    struct sockaddr *, struct route *);
-int	arc_ioctl(struct ifnet *, int, caddr_t);
+int	arc_ioctl(struct ifnet *, u_long, caddr_t);
 
 void		arc_frag_init(struct ifnet *);
 struct mbuf *	arc_frag_next(struct ifnet *);
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index f11ff59..0e23b24 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -672,7 +672,7 @@ arc_ifdetach(struct ifnet *ifp)
 }
 
 int
-arc_ioctl(struct ifnet *ifp, int command, caddr_t data)
+arc_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ifreq *ifr = (struct ifreq *) data;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index de26928..61346cc 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -617,7 +617,7 @@ fddi_ifdetach(ifp, bpf)
 int
 fddi_ioctl (ifp, command, data)
 	struct ifnet *ifp;
-	int command;
+	u_long command;
 	caddr_t data;
 {
 	struct ifaddr *ifa;
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index d4dc457..eac049a 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -631,7 +631,7 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
 }
 
 int
-firewire_ioctl(struct ifnet *ifp, int command, caddr_t data)
+firewire_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ifreq *ifr = (struct ifreq *) data;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index dafc57d..933065e 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -149,7 +149,7 @@ iso88025_ifdetach(ifp, bpf)
 }
 
 int
-iso88025_ioctl(struct ifnet *ifp, int command, caddr_t data)
+iso88025_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
         struct ifaddr *ifa;
         struct ifreq *ifr;
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index b42162b..6edd2e0 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -164,7 +164,7 @@ struct	iso88025_addr {
 
 void	iso88025_ifattach	(struct ifnet *, const u_int8_t *, int);
 void	iso88025_ifdetach	(struct ifnet *, int);
-int	iso88025_ioctl		(struct ifnet *, int , caddr_t );
+int	iso88025_ioctl		(struct ifnet *, u_long, caddr_t );
 int	iso88025_output		(struct ifnet *, struct mbuf *, struct sockaddr *,
     				 struct route *);
 void	iso88025_input		(struct ifnet *, struct mbuf *);
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 65dc944..091bd21 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -292,7 +292,7 @@ static int	X_ip_mrouter_done(void);
 static int	X_ip_mrouter_get(struct socket *, struct sockopt *);
 static int	X_ip_mrouter_set(struct socket *, struct sockopt *);
 static int	X_legal_vif_num(int);
-static int	X_mrt_ioctl(int, caddr_t, int);
+static int	X_mrt_ioctl(u_long, caddr_t, int);
 
 static int	add_bw_upcall(struct bw_upcall *);
 static int	add_mfc(struct mfcctl2 *);
@@ -511,7 +511,7 @@ X_ip_mrouter_get(struct socket *so, struct sockopt *sopt)
  * Handle ioctl commands to obtain information from the cache
  */
 static int
-X_mrt_ioctl(int cmd, caddr_t data, int fibnum __unused)
+X_mrt_ioctl(u_long cmd, caddr_t data, int fibnum __unused)
 {
     int error = 0;
 
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 73bb7f5..10e67d1 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -352,7 +352,7 @@ struct sockopt;
 extern int	(*ip_mrouter_set)(struct socket *, struct sockopt *);
 extern int	(*ip_mrouter_get)(struct socket *, struct sockopt *);
 extern int	(*ip_mrouter_done)(void);
-extern int	(*mrt_ioctl)(int, caddr_t, int);
+extern int	(*mrt_ioctl)(u_long, caddr_t, int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 43564a1..377e56b 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -111,7 +111,7 @@ int (*ip_mrouter_get)(struct socket *, struct sockopt *);
 int (*ip_mrouter_done)(void);
 int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
 		   struct ip_moptions *);
-int (*mrt_ioctl)(int, caddr_t, int);
+int (*mrt_ioctl)(u_long, caddr_t, int);
 int (*legal_vif_num)(int);
 u_long (*ip_mcast_src)(int);
 
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index e7bec95..49a4d65 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -343,7 +343,7 @@ int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
 int X_ip6_mrouter_done(void);
 int X_ip6_mrouter_set(struct socket *, struct sockopt *);
 int X_ip6_mrouter_get(struct socket *, struct sockopt *);
-int X_mrt6_ioctl(int, caddr_t);
+int X_mrt6_ioctl(u_long, caddr_t);
 
 static void
 pim6_init(void)
@@ -449,7 +449,7 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt)
  * Handle ioctl commands to obtain information from the cache
  */
 int
-X_mrt6_ioctl(int cmd, caddr_t data)
+X_mrt6_ioctl(u_long cmd, caddr_t data)
 {
 	int ret;
 
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index a0a5e4a..701d534 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -265,7 +265,7 @@ struct rtdetq {		/* XXX: rtdetq is also defined in ip_mroute.h */
 extern int	(*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt);
 extern int	(*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt);
 extern int	(*ip6_mrouter_done)(void);
-extern int	(*mrt6_ioctl)(int, caddr_t);
+extern int	(*mrt6_ioctl)(u_long, caddr_t);
 #endif /* _KERNEL */
 
 #endif /* !_NETINET6_IP6_MROUTE_H_ */
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 8b5a05c..3c514d8 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -145,7 +145,7 @@ int (*ip6_mrouter_set)(struct socket *, struct sockopt *);
 int (*ip6_mrouter_get)(struct socket *, struct sockopt *);
 int (*ip6_mrouter_done)(void);
 int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *);
-int (*mrt6_ioctl)(int, caddr_t);
+int (*mrt6_ioctl)(u_long, caddr_t);
 
 /*
  * Setup generic address and protocol structures for raw_input routine, then