diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2012-09-19 22:37:24 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2012-09-19 22:37:24 +0000 |
commit | 7107f52edae63d3ab1b175277d2e23a46e3986b3 (patch) | |
tree | 4238d74ab068164380c70ec4609e701b22db2b5b /sys | |
parent | fd71aa2d9c2e77b308610a84c5bca25bf4870551 (diff) |
ioctl requests are u_long not int, spotted via clang
ok deraadt@ miod@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/pci/if_san_common.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/if_san_common.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/if_san_xilinx.c | 6 | ||||
-rw-r--r-- | sys/net/pipex.c | 4 | ||||
-rw-r--r-- | sys/net/pipex.h | 4 | ||||
-rw-r--r-- | sys/netinet6/ip6_mroute.c | 2 | ||||
-rw-r--r-- | sys/netinet6/ip6_mroute.h | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/pci/if_san_common.c b/sys/dev/pci/if_san_common.c index 77f3ca913da..63f00567862 100644 --- a/sys/dev/pci/if_san_common.c +++ b/sys/dev/pci/if_san_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_common.c,v 1.13 2009/02/08 20:07:44 chl Exp $ */ +/* $OpenBSD: if_san_common.c,v 1.14 2012/09/19 22:37:23 jsg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -80,7 +80,7 @@ static int shutdown(sdla_t *card); #endif /* Miscellaneous functions */ -static int wan_ioctl(struct ifnet*, int, struct ifreq *); +static int wan_ioctl(struct ifnet*, u_long, struct ifreq *); static int sdla_isr(void *); static void release_hw(sdla_t *card); @@ -258,7 +258,7 @@ release_hw(sdla_t *card) */ static int -wan_ioctl(struct ifnet *ifp, int cmd, struct ifreq *ifr) +wan_ioctl(struct ifnet *ifp, u_long cmd, struct ifreq *ifr) { wanpipe_common_t *common = WAN_IFP_TO_COMMON(ifp); int err; diff --git a/sys/dev/pci/if_san_common.h b/sys/dev/pci/if_san_common.h index 762969f42fd..59d19a882f1 100644 --- a/sys/dev/pci/if_san_common.h +++ b/sys/dev/pci/if_san_common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_common.h,v 1.8 2005/11/08 20:23:42 canacar Exp $ */ +/* $OpenBSD: if_san_common.h,v 1.9 2012/09/19 22:37:23 jsg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -386,7 +386,7 @@ typedef struct sdla { int(*iface_up) (struct ifnet*); int(*iface_down) (struct ifnet*); int(*iface_send) (struct mbuf* skb, struct ifnet*); - int(*iface_ioctl) (struct ifnet*, int, struct ifreq*); + int(*iface_ioctl) (struct ifnet*, u_long, struct ifreq*); unsigned long state_tick; /* link state timestamp */ unsigned long in_isr; /* interrupt-in-service flag */ @@ -395,7 +395,7 @@ typedef struct sdla { void(*isr)(struct sdla*); /* interrupt service routine */ void(*poll)(struct sdla*); /* polling routine */ int(*exec)(struct sdla*, void*, void*); - int(*ioctl) (struct ifnet*, int, struct ifreq*); + int(*ioctl) (struct ifnet*, u_long, struct ifreq*); union { sdla_xilinx_t xilinx; diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c index 317e78f9f9f..01cfe836e9c 100644 --- a/sys/dev/pci/if_san_xilinx.c +++ b/sys/dev/pci/if_san_xilinx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_xilinx.c,v 1.26 2011/09/18 11:17:57 miod Exp $ */ +/* $OpenBSD: if_san_xilinx.c,v 1.27 2012/09/19 22:37:23 jsg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -206,7 +206,7 @@ static int wan_xilinx_release(sdla_t*, struct ifnet *); /* Network device interface */ static int wan_xilinx_up(struct ifnet *); static int wan_xilinx_down(struct ifnet *); -static int wan_xilinx_ioctl(struct ifnet *, int cmd, struct ifreq *); +static int wan_xilinx_ioctl(struct ifnet *, u_long cmd, struct ifreq *); static int wan_xilinx_send(struct mbuf *, struct ifnet *); static void handle_front_end_state(void *); @@ -668,7 +668,7 @@ wan_xilinx_dma_tx_try: } static int -wan_xilinx_ioctl(struct ifnet *ifp, int cmd, struct ifreq *ifr) +wan_xilinx_ioctl(struct ifnet *ifp, u_long cmd, struct ifreq *ifr) { xilinx_softc_t *sc = (xilinx_softc_t *)ifp->if_softc; struct mbuf *m; diff --git a/sys/net/pipex.c b/sys/net/pipex.c index bb2cbfd9dd2..9826a97cd6d 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.33 2012/09/19 17:50:17 yasuoka Exp $ */ +/* $OpenBSD: pipex.c,v 1.34 2012/09/19 22:37:23 jsg Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -204,7 +204,7 @@ pipex_iface_stop(struct pipex_iface_context *pipex_iface) /* called from tunioctl() with splnet() */ int -pipex_ioctl(struct pipex_iface_context *pipex_iface, int cmd, caddr_t data) +pipex_ioctl(struct pipex_iface_context *pipex_iface, u_long cmd, caddr_t data) { int pipexmode, ret; diff --git a/sys/net/pipex.h b/sys/net/pipex.h index b9bdbe51f8e..239f721b9e2 100644 --- a/sys/net/pipex.h +++ b/sys/net/pipex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.h,v 1.14 2012/09/19 17:50:17 yasuoka Exp $ */ +/* $OpenBSD: pipex.h,v 1.15 2012/09/19 22:37:23 jsg Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -217,7 +217,7 @@ struct mbuf *pipex_l2tp_input (struct mbuf *, int off, struct pipex_se struct pipex_session *pipex_l2tp_userland_lookup_session_ipv4 (struct mbuf *, struct in_addr); struct pipex_session *pipex_l2tp_userland_lookup_session_ipv6 (struct mbuf *, struct in6_addr); struct mbuf *pipex_l2tp_userland_output (struct mbuf *, struct pipex_session *); -int pipex_ioctl (struct pipex_iface_context *, int, caddr_t); +int pipex_ioctl (struct pipex_iface_context *, u_long, caddr_t); void pipex_session_init_mppe_recv(struct pipex_session *, int, int, u_char *); void pipex_session_init_mppe_send(struct pipex_session *, int, diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 5d9d40b70b1..762bcff38d5 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -313,7 +313,7 @@ ip6_mrouter_get(int cmd, struct socket *so, struct mbuf **m) * Handle ioctl commands to obtain information from the cache */ int -mrt6_ioctl(int cmd, caddr_t data) +mrt6_ioctl(u_long cmd, caddr_t data) { switch (cmd) { diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h index 4cdacbb18b7..ecfbfe2c18f 100644 --- a/sys/netinet6/ip6_mroute.h +++ b/sys/netinet6/ip6_mroute.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_mroute.h,v 1.7 2006/07/06 02:56:58 brad Exp $ */ +/* $OpenBSD: ip6_mroute.h,v 1.8 2012/09/19 22:37:23 jsg Exp $ */ /* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */ /* @@ -272,7 +272,7 @@ int ip6_mrouter_set(int, struct socket *, struct mbuf *); int ip6_mrouter_get(int, struct socket *, struct mbuf **); int ip6_mrouter_done(void); void ip6_mrouter_detach(struct ifnet *); -int mrt6_ioctl(int, caddr_t); +int mrt6_ioctl(u_long, caddr_t); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_MROUTE_H_ */ |