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)
This commit is contained in:
parent
941c2e1cd1
commit
e40bae9a45
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194581
@ -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_ */
|
||||
|
@ -135,7 +135,7 @@ extern void firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src);
|
||||
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 */
|
||||
|
||||
|
@ -2382,7 +2382,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
|
||||
error = (*ifp->if_ioctl)(ifp, cmd, data);
|
||||
#else
|
||||
{
|
||||
int ocmd = cmd;
|
||||
u_long ocmd = cmd;
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
|
@ -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 *);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -631,7 +631,7 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -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;
|
||||
|
@ -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 *);
|
||||
|
@ -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, struct sockopt *sopt)
|
||||
* 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;
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -111,7 +111,7 @@ int (*ip_mrouter_get)(struct socket *, struct sockopt *);
|
||||
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);
|
||||
|
||||
|
@ -343,7 +343,7 @@ int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
|
||||
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, struct sockopt *sopt)
|
||||
* 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;
|
||||
|
||||
|
@ -265,7 +265,7 @@ struct rtdetq { /* XXX: rtdetq is also defined in ip_mroute.h */
|
||||
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_ */
|
||||
|
@ -145,7 +145,7 @@ int (*ip6_mrouter_set)(struct socket *, struct sockopt *);
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user