diff options
author | yar <yar@FreeBSD.org> | 2007-05-29 12:40:45 +0000 |
---|---|---|
committer | yar <yar@FreeBSD.org> | 2007-05-29 12:40:45 +0000 |
commit | 80a596eeced750d312f2c869efeafd2f8f2ac397 (patch) | |
tree | a6fa590eb2b0de38e6e26c77c03e780b7b564556 /sys/net | |
parent | 7db245bca4254bf1dbab159c7a26bb1a884ac845 (diff) | |
download | FreeBSD-src-80a596eeced750d312f2c869efeafd2f8f2ac397.zip FreeBSD-src-80a596eeced750d312f2c869efeafd2f8f2ac397.tar.gz |
Sync ether_ioctl() with ioctl(2) and ifnet.if_ioctl
as to the type of the command argument: int -> u_long.
These types have different widths in the 64-bit world.
Add a note to UPDATING because the change breaks KBI
on 64-bit platforms.
Discussed on: -net, -current
Reviewed by: bms, ru
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/ethernet.h | 2 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 56b3cd2..29a5316 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -379,7 +379,7 @@ extern uint32_t ether_crc32_be(const uint8_t *, size_t); extern void ether_demux(struct ifnet *, struct mbuf *); extern void ether_ifattach(struct ifnet *, const u_int8_t *); extern void ether_ifdetach(struct ifnet *); -extern int ether_ioctl(struct ifnet *, int, caddr_t); +extern int ether_ioctl(struct ifnet *, u_long, caddr_t); extern int ether_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); extern int ether_output_frame(struct ifnet *, struct mbuf *); diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index acf0846..1fabaca 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1018,7 +1018,7 @@ ether_crc32_be(const uint8_t *buf, size_t len) } int -ether_ioctl(struct ifnet *ifp, int command, caddr_t data) +ether_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct ifaddr *ifa = (struct ifaddr *) data; struct ifreq *ifr = (struct ifreq *) data; |