summaryrefslogtreecommitdiff
path: root/sys/netipx
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-09-23 10:22:14 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-09-23 10:22:14 +0000
commit1e51c151caf32fd6e6dffda729bde6d2a0b7da44 (patch)
tree43f70628267f63310b120e0f8c6e3d81c9aa2516 /sys/netipx
parent4518752a69ed90bfa748ccb9197b03f639b7099f (diff)
make this compile on alpha
Diffstat (limited to 'sys/netipx')
-rw-r--r--sys/netipx/ipx_cksum.c4
-rw-r--r--sys/netipx/ipx_ip.c8
-rw-r--r--sys/netipx/ipx_usrreq.c4
-rw-r--r--sys/netipx/spx_usrreq.c12
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index b269c9db6d1..11c07a035cc 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx_cksum.c,v 1.3 2001/09/20 17:02:32 mpech Exp $ */
+/* $OpenBSD: ipx_cksum.c,v 1.4 2001/09/23 10:22:13 mickey Exp $ */
/*-
*
@@ -105,7 +105,7 @@ ipx_cksum(m, len)
* into the high (by normal carry-chaining)
* so long as we fold back before 16 carries have occurred.
*/
- if (1 & (int) w)
+ if (1 & (long) w)
goto uuuuglyy;
#ifndef TINY
/* -DTINY reduces the size from 1250 to 550, but slows it down by 22% */
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 6f5e862ecdf..a01098637c4 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx_ip.c,v 1.10 2001/05/27 12:16:01 angelos Exp $ */
+/* $OpenBSD: ipx_ip.c,v 1.11 2001/09/23 10:22:13 mickey Exp $ */
/*-
*
@@ -34,7 +34,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* @(#)ipx_ip.c
*
* from FreeBSD Id: ipx_ip.c,v 1.7 1996/03/11 15:13:50 davidg Exp
@@ -266,7 +266,7 @@ ipxipoutput(ifp, m, dst, rt)
if (len & 1)
len++; /* Preserve Garbage Byte */
/* following clause not necessary on vax */
- if (3 & (int)m->m_data) {
+ if (3 & (long)m->m_data) {
/* force longword alignment of ip hdr */
struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
if (m0 == NULL) {
@@ -389,7 +389,7 @@ ipxip_route(m)
satoipx_addr(ifr_ipxip.ifr_addr).ipx_host =
ipx_ifaddr.tqh_first->ia_addr.sipx_addr.ipx_host;
-
+
return (ipx_control((struct socket *)0, (int)SIOCSIFADDR,
(caddr_t)&ifr_ipxip, (struct ifnet *)ifn));
}
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 0911fa457af..0cc0b3bcc6f 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx_usrreq.c,v 1.8 2000/01/17 00:34:00 fgsch Exp $ */
+/* $OpenBSD: ipx_usrreq.c,v 1.9 2001/09/23 10:22:13 mickey Exp $ */
/*-
*
@@ -401,7 +401,7 @@ ipx_usrreq(so, req, m, nam, control)
int error = 0;
if (req == PRU_CONTROL)
- return (ipx_control(so, (int)m, (caddr_t)nam,
+ return (ipx_control(so, (long)m, (caddr_t)nam,
(struct ifnet *)control));
if (control && control->m_len) {
error = EINVAL;
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 9225bb3680a..ef961ea9e73 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spx_usrreq.c,v 1.16 2001/06/27 03:49:54 angelos Exp $ */
+/* $OpenBSD: spx_usrreq.c,v 1.17 2001/09/23 10:22:13 mickey Exp $ */
/*-
*
@@ -1276,7 +1276,7 @@ spx_usrreq(so, req, m, nam, controlp)
register struct sockbuf *sb;
if (req == PRU_CONTROL)
- return (ipx_control(so, (int)m, (caddr_t)nam,
+ return (ipx_control(so, (long)m, (caddr_t)nam,
(struct ifnet *)controlp));
if (ipxp == NULL) {
if (req != PRU_ATTACH) {
@@ -1481,8 +1481,8 @@ spx_usrreq(so, req, m, nam, controlp)
break;
case PRU_SLOWTIMO:
- cb = spx_timers(cb, (int)nam);
- req |= ((int)nam) << 8;
+ cb = spx_timers(cb, (long)nam);
+ req |= ((long)nam) << 8;
break;
case PRU_FASTTIMO:
@@ -1683,8 +1683,8 @@ spx_slowtimo()
for (i = 0; i < SPXT_NTIMERS; i++) {
if (cb->s_timer[i] && --cb->s_timer[i] == 0) {
(void) spx_usrreq(cb->s_ipxpcb->ipxp_socket,
- PRU_SLOWTIMO, (struct mbuf *)0,
- (struct mbuf *)i, (struct mbuf *)0);
+ PRU_SLOWTIMO, NULL,
+ (struct mbuf *)(long)i, NULL);
if (ipxnxt->ipxp_queue.cqe_prev != ipx)
goto tpgone;
}