diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-08-31 01:10:02 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-08-31 01:10:02 +0000 |
commit | a009d94459a8c8e126dadc8ee335b5833556dac7 (patch) | |
tree | f582cdcd1a13e5a920f2adfd668d153228ebf2cf /cpukit/libnetworking/net | |
parent | 2006-08-30 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-a009d94459a8c8e126dadc8ee335b5833556dac7.tar.bz2 |
2006-08-30 Joel Sherrill <joel@OARcorp.com>
* ftpd/ftpd.c, libcsupport/include/sys/ioccom.h,
libcsupport/src/ioctl.c, libnetworking/kern/uipc_mbuf.c,
libnetworking/libc/inet_addr.c, libnetworking/net/ethernet.h,
libnetworking/net/if.c, libnetworking/net/if_ethersubr.c,
libnetworking/net/if_ppp.c, libnetworking/net/if_pppvar.h,
libnetworking/net/if_var.h, libnetworking/net/ppp_tty.c,
libnetworking/netinet/in_cksum.c, libnetworking/nfs/bootp_subr.c,
libnetworking/rtems/rtems_bsdnet_internal.h,
libnetworking/sys/mbuf.h, pppd/md4.c, pppd/pppd.h: Remove warnings
due to improper use of int which shows up on 16 bit targets. Added
ioctl_command_t since IOCTL command argument does not reliably fit
into 16 bits.
Diffstat (limited to 'cpukit/libnetworking/net')
-rw-r--r-- | cpukit/libnetworking/net/ethernet.h | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_ethersubr.c | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_ppp.c | 6 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_pppvar.h | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_var.h | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/net/ppp_tty.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/cpukit/libnetworking/net/ethernet.h b/cpukit/libnetworking/net/ethernet.h index 85f288a231..380ee1bad0 100644 --- a/cpukit/libnetworking/net/ethernet.h +++ b/cpukit/libnetworking/net/ethernet.h @@ -360,7 +360,7 @@ extern uint32_t ether_crc32_be(const uint8_t *, size_t); extern void ether_demux(struct ifnet *, struct mbuf *); extern void ether_ifattach(struct ifnet *); extern void ether_ifdetach(struct ifnet *); -extern int ether_ioctl(struct ifnet *, int32_t, caddr_t); +extern int ether_ioctl(struct ifnet *, ioctl_command_t, caddr_t); extern void ether_input (struct ifnet *, struct ether_header *, struct mbuf *); extern int ether_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); diff --git a/cpukit/libnetworking/net/if.c b/cpukit/libnetworking/net/if.c index b7a7c1ee21..3b9921311d 100644 --- a/cpukit/libnetworking/net/if.c +++ b/cpukit/libnetworking/net/if.c @@ -559,7 +559,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) * 72 was chosen below because it is the size of a TCP/IP * header (40) + the minimum mss (32). */ - if (ifr->ifr_mtu < 72 || ifr->ifr_mtu > 65535) + if (ifr->ifr_mtu < 72 || ifr->ifr_mtu > 65535L) return (EINVAL); error = (*ifp->if_ioctl)(ifp, cmd, data); if (error == 0) diff --git a/cpukit/libnetworking/net/if_ethersubr.c b/cpukit/libnetworking/net/if_ethersubr.c index 31e9a88ac5..80f6db0a1f 100644 --- a/cpukit/libnetworking/net/if_ethersubr.c +++ b/cpukit/libnetworking/net/if_ethersubr.c @@ -825,7 +825,7 @@ ether_crc32_be(const uint8_t *buf, size_t len) } int -ether_ioctl(struct ifnet *ifp, int32_t command, caddr_t data) +ether_ioctl(struct ifnet *ifp, ioctl_command_t command, caddr_t data) { struct ifaddr *ifa = (struct ifaddr *) data; struct ifreq *ifr = (struct ifreq *) data; diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c index f0a8bb69bb..af516342fa 100644 --- a/cpukit/libnetworking/net/if_ppp.c +++ b/cpukit/libnetworking/net/if_ppp.c @@ -132,7 +132,7 @@ #include <net/ppp-comp.h> #endif -static int pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +static int pppsioctl(struct ifnet *ifp, ioctl_command_t 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); @@ -619,7 +619,7 @@ pppdealloc(sc) int pppioctl(sc, cmd, data, flag, p) struct ppp_softc *sc; - int32_t cmd; + ioctl_command_t cmd; caddr_t data; int flag; struct proc *p; @@ -838,7 +838,7 @@ pppioctl(sc, cmd, data, flag, p) * Process an ioctl request to the ppp network interface. */ static int -pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +pppsioctl(struct ifnet *ifp, ioctl_command_t cmd, caddr_t data) { /*struct proc *p = curproc;*/ /* XXX */ register struct ppp_softc *sc = &ppp_softc[ifp->if_unit]; diff --git a/cpukit/libnetworking/net/if_pppvar.h b/cpukit/libnetworking/net/if_pppvar.h index cffa25c693..d6a1c7a7d6 100644 --- a/cpukit/libnetworking/net/if_pppvar.h +++ b/cpukit/libnetworking/net/if_pppvar.h @@ -118,7 +118,7 @@ struct ppp_softc *pppalloc(pid_t pid); void pppdealloc(struct ppp_softc *sc); int pppoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); -int pppioctl(struct ppp_softc *sc, int32_t cmd, caddr_t data, +int pppioctl(struct ppp_softc *sc, ioctl_command_t cmd, caddr_t data, int flag, struct proc *p); struct mbuf *ppp_dequeue(struct ppp_softc *sc); u_short pppfcs(u_short fcs, u_char *cp, int len); diff --git a/cpukit/libnetworking/net/if_var.h b/cpukit/libnetworking/net/if_var.h index ad32cd11a6..7aa0ddbf43 100644 --- a/cpukit/libnetworking/net/if_var.h +++ b/cpukit/libnetworking/net/if_var.h @@ -116,7 +116,7 @@ struct ifnet { void (*if_start) /* initiate output routine */ (struct ifnet *); int (*if_ioctl) /* ioctl routine */ - (struct ifnet *, u_long, caddr_t); + (struct ifnet *, ioctl_command_t, caddr_t); void (*if_watchdog) /* timer routine */ (struct ifnet *); int (*if_poll_recv) /* polled receive routine */ diff --git a/cpukit/libnetworking/net/ppp_tty.c b/cpukit/libnetworking/net/ppp_tty.c index 76eea6164c..d3de18ac62 100644 --- a/cpukit/libnetworking/net/ppp_tty.c +++ b/cpukit/libnetworking/net/ppp_tty.c @@ -427,7 +427,7 @@ ppptioctl(struct rtems_termios_tty *tty, rtems_libio_ioctl_args_t *args) { /* int i; */ int error = RTEMS_SUCCESSFUL; - int32_t cmd = args->command; + ioctl_command_t cmd = args->command; caddr_t data = args->buffer; struct ppp_softc *sc = tty->t_sc; |