aboutsummaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorRoman Divacky <rdivacky@FreeBSD.org>2009-06-21 10:29:31 +0000
committerRoman Divacky <rdivacky@FreeBSD.org>2009-06-21 10:29:31 +0000
commite40bae9a45a5f485e2b1c5964e46019b0eb05d07 (patch)
tree709b2b15ea4228160504c96db1a7d1a3e5ee6170 /sys/net
parent941c2e1cd1e62387d1e876739b5e6b0c46fef332 (diff)
downloadsrc-e40bae9a45a5f485e2b1c5964e46019b0eb05d07.tar.gz
src-e40bae9a45a5f485e2b1c5964e46019b0eb05d07.zip
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)
Notes
Notes: svn path=/head/; revision=194581
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/fddi.h2
-rw-r--r--sys/net/firewire.h2
-rw-r--r--sys/net/if.c2
-rw-r--r--sys/net/if_arc.h2
-rw-r--r--sys/net/if_arcsubr.c2
-rw-r--r--sys/net/if_fddisubr.c2
-rw-r--r--sys/net/if_fwsubr.c2
-rw-r--r--sys/net/if_iso88025subr.c2
-rw-r--r--sys/net/iso88025.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 869a8d93b7ed..71e3b6fbd438 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 d47b8225e9dc..bab71a58678c 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 2881612fd44b..c5e1a56f61c6 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 086aeb0f6772..88a72403beee 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 f11ff5926ced..0e23b249d2b8 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 de26928f478b..61346cce1b36 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 d4dc457c98c7..eac049a2d0c6 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 dafc57d24605..933065e25af6 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 b42162bb2664..6edd2e0b1bc7 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 *);