diff options
author | sobomax <sobomax@FreeBSD.org> | 2002-08-18 07:05:00 +0000 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2002-08-18 07:05:00 +0000 |
commit | f6cebc060671b6c67f52080c35a0e55d5498cbf0 (patch) | |
tree | 344b7a3da98a22c060f844fe311e36665045f41f /sys/net/if.h | |
parent | 2f2bf8ffc0ae7c92c322a28e5781db15fbca6226 (diff) | |
download | FreeBSD-src-f6cebc060671b6c67f52080c35a0e55d5498cbf0.zip FreeBSD-src-f6cebc060671b6c67f52080c35a0e55d5498cbf0.tar.gz |
Increase size of ifnet.if_flags from 16 bits (short) to 32 bits (int). To avoid
breaking application ABI use unused ifreq.ifru_flags[1] for upper 16 bits in
SIOCSIFFLAGS and SIOCGIFFLAGS ioctl's.
Reviewed by: -hackers, -net
Diffstat (limited to 'sys/net/if.h')
-rw-r--r-- | sys/net/if.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 0074cec..fc95786 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -139,14 +139,6 @@ struct if_data { #define IFF_LINK2 0x4000 /* per link layer defined bit */ #define IFF_ALTPHYS IFF_LINK2 /* use alternate physical connection */ #define IFF_MULTICAST 0x8000 /* supports multicast */ - -/* - * The following flag(s) ought to go in if_flags, but we cannot change - * struct ifnet because of binary compatibility, so we store them in - * if_ipending, which is not used so far. - * If possible, make sure the value is not conflicting with other - * IFF flags, so we have an easier time when we want to merge them. - */ #define IFF_POLLING 0x10000 /* Interface is in polling mode. */ /* flags set internally only: */ @@ -244,8 +236,8 @@ struct ifreq { #define ifr_addr ifr_ifru.ifru_addr /* address */ #define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */ #define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -#define ifr_flags ifr_ifru.ifru_flags[0] /* flags */ -#define ifr_prevflags ifr_ifru.ifru_flags[1] /* flags */ +#define ifr_flags ifr_ifru.ifru_flags[0] /* flags (low 16 bits) */ +#define ifr_flagshigh ifr_ifru.ifru_flags[1] /* flags (high 16 bits) */ #define ifr_metric ifr_ifru.ifru_metric /* metric */ #define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ #define ifr_phys ifr_ifru.ifru_phys /* physical wire */ |