diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2009-06-21 10:29:31 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2009-06-21 10:29:31 +0000 |
| commit | 9992cf9aeb5d9178333f32395b7e9015cb0c5fec (patch) | |
| tree | 709b2b15ea4228160504c96db1a7d1a3e5ee6170 /sys/netinet | |
| parent | b867569d3ecacd8487aadc3fd07e29e03629bcfd (diff) | |
| download | FreeBSD-src-9992cf9aeb5d9178333f32395b7e9015cb0c5fec.zip FreeBSD-src-9992cf9aeb5d9178333f32395b7e9015cb0c5fec.tar.gz | |
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)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_mroute.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_mroute.h | 2 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 65dc944..091bd21 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -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; diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 73bb7f5..10e67d1 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -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 */ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 43564a1..377e56b 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -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); |
