Date: Sun, 11 Mar 2007 22:49:28 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 115740 for review Message-ID: <200703112249.l2BMnSaU011233@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=115740 Change 115740 by sam@sam_ebb on 2007/03/11 22:48:53 IFC Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#45 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#71 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#51 integrate Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#45 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.36 2007/03/11 06:24:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.37 2007/03/11 22:37:31 sam Exp $"); /* * IEEE 802.11 generic handler ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#71 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.53 2007/03/11 07:06:07 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.54 2007/03/11 22:37:31 sam Exp $"); #include "opt_compat.h" ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.6 2006/01/09 17:04:56 sam Exp $ */ -/* $NetBSD: ieee80211_radiotap.h,v 1.10 2005/01/04 00:34:58 dyoung Exp $ */ +/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.7 2007/03/11 07:42:02 sam Exp $ */ +/* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */ /*- * Copyright (c) 2003, 2004 David Young. All rights reserved. @@ -52,7 +52,13 @@ #endif #endif /* defined(__KERNEL__) || defined(_KERNEL) */ -/* The radio capture header precedes the 802.11 header. */ +#define IEEE80211_RADIOTAP_HDRLEN 64 /* XXX deprecated */ + +/* + * The radio capture header precedes the 802.11 header. + * + * Note well: all radiotap fields are little-endian. + */ struct ieee80211_radiotap_header { u_int8_t it_version; /* Version 0. Only increases * for drastic changes, @@ -206,4 +212,4 @@ */ #define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */ -#endif /* _NET_IF_IEEE80211RADIOTAP_H_ */ +#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */ ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#51 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.47 2007/03/11 07:15:38 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.48 2007/03/11 22:37:31 sam Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703112249.l2BMnSaU011233>