From 4bb1ed13080767f01c149bde44c8a476146c0126 Mon Sep 17 00:00:00 2001 From: gmcgarry Date: Tue, 24 Jun 2008 10:35:14 +0000 Subject: [PATCH] ioctl commands are unsigned long. ABI change to mrt6_ioctl() will affect 64-bit platforms. --- sys/netinet6/ip6_mroute.c | 6 +++--- sys/netinet6/ip6_mroute.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 33aee3e38c63..05195a75b8cf 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_mroute.c,v 1.94 2008/05/22 01:06:39 dyoung Exp $ */ +/* $NetBSD: ip6_mroute.c,v 1.95 2008/06/24 10:35:14 gmcgarry Exp $ */ /* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */ /* @@ -117,7 +117,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.94 2008/05/22 01:06:39 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.95 2008/06/24 10:35:14 gmcgarry Exp $"); #include "opt_inet.h" #include "opt_mrouting.h" @@ -373,7 +373,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, void *data) +mrt6_ioctl(u_long cmd, void *data) { switch (cmd) { diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h index 8c0c77c3e461..c61eb6c8c28f 100644 --- a/sys/netinet6/ip6_mroute.h +++ b/sys/netinet6/ip6_mroute.h @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_mroute.h,v 1.13 2007/11/01 20:33:57 dyoung Exp $ */ +/* $NetBSD: ip6_mroute.h,v 1.14 2008/06/24 10:35:15 gmcgarry Exp $ */ /* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */ /* @@ -271,7 +271,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, void *); +int mrt6_ioctl(u_long, void *); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_MROUTE_H_ */