PERFORCE change 114726 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=114726

Change 114726 by sam at sam_ebb on 2007/02/19 19:15:55

	sync a bit w/ netbsd; remove incorrect and very misleading
	comment about radiotap headers being padded to 64 bytes;
	they have not been padded in freebsd for several years

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#8 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#8 (text+ko) ====

@@ -29,14 +29,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  */
-#ifndef _NET_IF_IEEE80211RADIOTAP_H_
-#define _NET_IF_IEEE80211RADIOTAP_H_
+#ifndef _NET80211_IEEE80211_RADIOTAP_H_
+#define _NET80211_IEEE80211_RADIOTAP_H_
 
-/* A generic radio capture format is desirable. There is one for
- * Linux, but it is neither rigidly defined (there were not even
- * units given for some fields) nor easily extensible.
+/* A generic radio capture format is desirable. It must be
+ * rigidly defined (e.g., units for fields should be given),
+ * and easily extensible.
  *
- * I suggest the following extensible radio capture format. It is
+ * The following is an extensible radio capture format. It is
  * based on a bitmap indicating which fields are present.
  *
  * I am trying to describe precisely what the application programmer
@@ -52,11 +52,6 @@
 #endif
 #endif /* defined(__KERNEL__) || defined(_KERNEL) */
 
-/* XXX tcpdump/libpcap do not tolerate variable-length headers,
- * yet, so we pad every radiotap header to 64 bytes. Ugh.
- */
-#define IEEE80211_RADIOTAP_HDRLEN	64
-
 /* The radio capture header precedes the 802.11 header. */
 struct ieee80211_radiotap_header {
 	u_int8_t	it_version;	/* Version 0. Only increases
@@ -79,7 +74,8 @@
 					 */
 } __attribute__((__packed__));
 
-/* Name                                 Data type       Units
+/*
+ * Name                                 Data type       Units
  * ----                                 ---------       -----
  *
  * IEEE80211_RADIOTAP_TSFT              u_int64_t       microseconds