Date: Sun, 21 Jun 2009 10:29:31 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r194581 - in head/sys: net netinet netinet6 Message-ID: <200906211029.n5LATVNu002851@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Sun Jun 21 10:29:31 2009 New Revision: 194581 URL: http://svn.freebsd.org/changeset/base/194581 Log: 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) Modified: head/sys/net/fddi.h head/sys/net/firewire.h head/sys/net/if.c head/sys/net/if_arc.h head/sys/net/if_arcsubr.c head/sys/net/if_fddisubr.c head/sys/net/if_fwsubr.c head/sys/net/if_iso88025subr.c head/sys/net/iso88025.h head/sys/netinet/ip_mroute.c head/sys/netinet/ip_mroute.h head/sys/netinet/raw_ip.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/ip6_mroute.h head/sys/netinet6/raw_ip6.c Modified: head/sys/net/fddi.h ============================================================================== --- head/sys/net/fddi.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/fddi.h Sun Jun 21 10:29:31 2009 (r194581) @@ -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_ */ Modified: head/sys/net/firewire.h ============================================================================== --- head/sys/net/firewire.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/firewire.h Sun Jun 21 10:29:31 2009 (r194581) @@ -135,7 +135,7 @@ extern void firewire_input(struct ifnet 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 */ Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if.c Sun Jun 21 10:29:31 2009 (r194581) @@ -2382,7 +2382,7 @@ ifioctl(struct socket *so, u_long cmd, c error = (*ifp->if_ioctl)(ifp, cmd, data); #else { - int ocmd = cmd; + u_long ocmd = cmd; switch (cmd) { Modified: head/sys/net/if_arc.h ============================================================================== --- head/sys/net/if_arc.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if_arc.h Sun Jun 21 10:29:31 2009 (r194581) @@ -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 *); Modified: head/sys/net/if_arcsubr.c ============================================================================== --- head/sys/net/if_arcsubr.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if_arcsubr.c Sun Jun 21 10:29:31 2009 (r194581) @@ -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; Modified: head/sys/net/if_fddisubr.c ============================================================================== --- head/sys/net/if_fddisubr.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if_fddisubr.c Sun Jun 21 10:29:31 2009 (r194581) @@ -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; Modified: head/sys/net/if_fwsubr.c ============================================================================== --- head/sys/net/if_fwsubr.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if_fwsubr.c Sun Jun 21 10:29:31 2009 (r194581) @@ -631,7 +631,7 @@ firewire_input(struct ifnet *ifp, struct } 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; Modified: head/sys/net/if_iso88025subr.c ============================================================================== --- head/sys/net/if_iso88025subr.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/if_iso88025subr.c Sun Jun 21 10:29:31 2009 (r194581) @@ -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; Modified: head/sys/net/iso88025.h ============================================================================== --- head/sys/net/iso88025.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/net/iso88025.h Sun Jun 21 10:29:31 2009 (r194581) @@ -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 *); Modified: head/sys/netinet/ip_mroute.c ============================================================================== --- head/sys/netinet/ip_mroute.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet/ip_mroute.c Sun Jun 21 10:29:31 2009 (r194581) @@ -292,7 +292,7 @@ static int X_ip_mrouter_done(void); static int X_ip_mrouter_get(struct socket *, struct sockopt *); static int X_ip_mrouter_set(struct socket *, struct sockopt *); static int X_legal_vif_num(int); -static int X_mrt_ioctl(int, caddr_t, int); +static int X_mrt_ioctl(u_long, caddr_t, int); static int add_bw_upcall(struct bw_upcall *); static int add_mfc(struct mfcctl2 *); @@ -511,7 +511,7 @@ X_ip_mrouter_get(struct socket *so, stru * Handle ioctl commands to obtain information from the cache */ static int -X_mrt_ioctl(int cmd, caddr_t data, int fibnum __unused) +X_mrt_ioctl(u_long cmd, caddr_t data, int fibnum __unused) { int error = 0; Modified: head/sys/netinet/ip_mroute.h ============================================================================== --- head/sys/netinet/ip_mroute.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet/ip_mroute.h Sun Jun 21 10:29:31 2009 (r194581) @@ -352,7 +352,7 @@ struct sockopt; extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); extern int (*ip_mrouter_done)(void); -extern int (*mrt_ioctl)(int, caddr_t, int); +extern int (*mrt_ioctl)(u_long, caddr_t, int); #endif /* _KERNEL */ Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet/raw_ip.c Sun Jun 21 10:29:31 2009 (r194581) @@ -111,7 +111,7 @@ int (*ip_mrouter_get)(struct socket *, s int (*ip_mrouter_done)(void); int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); -int (*mrt_ioctl)(int, caddr_t, int); +int (*mrt_ioctl)(u_long, caddr_t, int); int (*legal_vif_num)(int); u_long (*ip_mcast_src)(int); Modified: head/sys/netinet6/ip6_mroute.c ============================================================================== --- head/sys/netinet6/ip6_mroute.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet6/ip6_mroute.c Sun Jun 21 10:29:31 2009 (r194581) @@ -343,7 +343,7 @@ int X_ip6_mforward(struct ip6_hdr *, str int X_ip6_mrouter_done(void); int X_ip6_mrouter_set(struct socket *, struct sockopt *); int X_ip6_mrouter_get(struct socket *, struct sockopt *); -int X_mrt6_ioctl(int, caddr_t); +int X_mrt6_ioctl(u_long, caddr_t); static void pim6_init(void) @@ -449,7 +449,7 @@ X_ip6_mrouter_get(struct socket *so, str * Handle ioctl commands to obtain information from the cache */ int -X_mrt6_ioctl(int cmd, caddr_t data) +X_mrt6_ioctl(u_long cmd, caddr_t data) { int ret; Modified: head/sys/netinet6/ip6_mroute.h ============================================================================== --- head/sys/netinet6/ip6_mroute.h Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet6/ip6_mroute.h Sun Jun 21 10:29:31 2009 (r194581) @@ -265,7 +265,7 @@ struct rtdetq { /* XXX: rtdetq is also extern int (*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt); extern int (*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt); extern int (*ip6_mrouter_done)(void); -extern int (*mrt6_ioctl)(int, caddr_t); +extern int (*mrt6_ioctl)(u_long, caddr_t); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_MROUTE_H_ */ Modified: head/sys/netinet6/raw_ip6.c ============================================================================== --- head/sys/netinet6/raw_ip6.c Sun Jun 21 10:10:44 2009 (r194580) +++ head/sys/netinet6/raw_ip6.c Sun Jun 21 10:29:31 2009 (r194581) @@ -145,7 +145,7 @@ int (*ip6_mrouter_set)(struct socket *, int (*ip6_mrouter_get)(struct socket *, struct sockopt *); int (*ip6_mrouter_done)(void); int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *); -int (*mrt6_ioctl)(int, caddr_t); +int (*mrt6_ioctl)(u_long, caddr_t); /* * Setup generic address and protocol structures for raw_input routine, then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906211029.n5LATVNu002851>