2014-08-19 14:19 GMT+04:00 Reyk Floeter <r...@openbsd.org>:
> On Fri, Aug 15, 2014 at 09:35:03PM +0400, Vadim Zhukov wrote:
>> The SIOCG80211ALLNODES operate on struct ieee80211_nodereq_all, not
>> on struct ieee80211_nodereq, right? If I understand things correctly,
>> we were on a safe side because struct ieee80211_nodereq is larger
>> than struct ieee80211_nodereq_all. Should this follow some bump? OK?
>>
>
> OK, but remove the XXX comment ;)
Thank you. It looks like we have more ioctl problems, though:
SIOCSPRISM2DEBUG=137, in /usr/src/sys/dev/ic/if_wi_ieee.h
same ID for SIOCGATHSTATS in /usr/src/sys/dev/ic/athvar.h
SIOCGSLSTATS=123, in /usr/src/sys/net/if_slvar.h
same ID for SIOCGPPPSTATS in /usr/src/sys/net/if_ppp.h
SIOCG80211ALLCHANS=215, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_SFLAGS in /usr/src/sys/dev/ic/if_wi_hostap.h
SIOCS80211WMMPARMS=249, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCSWAVELAN in /usr/src/sys/dev/ic/if_wi_ieee.h
SIOCG80211WMMPARMS=250, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCGWAVELAN in /usr/src/sys/dev/ic/if_wi_ieee.h
SIOCS80211SCAN=210, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_GET in /usr/src/sys/dev/ic/if_wi_hostap.h
SIOCG80211NODE=211, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_ADD in /usr/src/sys/dev/ic/if_wi_hostap.h
SIOCS80211NODE=212, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_DEL in /usr/src/sys/dev/ic/if_wi_hostap.h
SIOCS80211DELNODE=213, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_GETALL in /usr/src/sys/dev/ic/if_wi_hostap.h
SIOCG80211ALLNODES=214, in /usr/src/sys/net80211/ieee80211_ioctl.h
same ID for SIOCHOSTAP_GFLAGS in /usr/src/sys/dev/ic/if_wi_hostap.h
First two conflicts look like harmless, bu I'm not sure how others are
supposed to work... I guess the wi(4) ones should be renamed? BTW,
kernel build breaks for me now if I don't tweak those IDs.
>> Index: ieee80211_ioctl.h
>> ===================================================================
>> RCS file: /cvs/src/sys/net80211/ieee80211_ioctl.h,v
>> retrieving revision 1.19
>> diff -u -p -r1.19 ieee80211_ioctl.h
>> --- ieee80211_ioctl.h 10 Jul 2014 14:32:28 -0000 1.19
>> +++ ieee80211_ioctl.h 15 Aug 2014 17:32:24 -0000
>> @@ -348,7 +348,8 @@ struct ieee80211_nodereq_all {
>> u_int8_t na_flags; /* IEEE80211_NODEREQ_*
>> */
>> };
>>
>> -#define SIOCG80211ALLNODES _IOWR('i', 214, struct ieee80211_nodereq)
>> +/* XXX typo, should be ieee80211_nodereq_all instead? */
>> +#define SIOCG80211ALLNODES _IOWR('i', 214, struct ieee80211_nodereq_all)
>>
>> /* net80211 specific interface flags */
>> #define IEEE80211_F_HIDENWID 0x10000000 /* CONF: hidden ssid mode */
--
WBR,
Vadim Zhukov
