Menu
▾
▴
[Ieee80211-devel] Re: [PATCH 23/29] ieee80211 Added ieee80211_radiotap.h
|
From: James K. <jke...@li...> - 2005-09-14 14:01:25
|
Christoph Hellwig wrote:
>On Tue, Sep 13, 2005 at 06:35:13PM -0500, James Ketrenos wrote:
>
>
>>+ * are met:
>>+ * 1. Redistributions of source code must retain the above copyright
>>+ * notice, this list of conditions and the following disclaimer.
>>+ * 2. Redistributions in binary form must reproduce the above copyright
>>+ * notice, this list of conditions and the following disclaimer in the
>>+ * documentation and/or other materials provided with the distribution.
>>+ * 3. The name of David Young may not be used to endorse or promote
>>+ * products derived from this software without specific prior
>>+ * written permission.
>>
>>
>
>Is this actually GPL-compatible?
>
>
Per FSF[1], the modified BSD license is compatible with the GPL. Its
used throughout other files in the kernel tree (grep for 'may not be
used' or 'redistributions of source code must').
>>+#include <linux/version.h>
>>
>>
>
>shouldn;t be beeded,
>
>
Removed.
>>+/* Kluge the radiotap linktype for now if we don't have it */
>>+#ifndef ARPHRD_IEEE80211_RADIOTAP
>>+#define ARPHRD_IEEE80211_RADIOTAP 803
>>+#endif
>>
>>
>
>please get that right.
>
>
This should go into include/linux/if_arp.h anyway, correct?
>>+ u_int8_t it_version; /* Version 0. Only increases
>>
>>
>please use u8/etc types as in the rest of the kernel, or SuS
>uint8_t/etc types if you really want to.
>
>
A quick sed script now has them set to uN vs. u_intN_t.
Patch covering the above changes follows.
Thanks,
James
---
include/linux/if_arp.h | 1 +
include/net/ieee80211_radiotap.h | 38 ++++++++++++++++----------------------
2 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -84,6 +84,7 @@
#define ARPHRD_IEEE802_TR 800 /* Magic type ident for TR */
#define ARPHRD_IEEE80211 801 /* IEEE 802.11 */
#define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */
+#define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + Radiotap header */
#define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
#define ARPHRD_NONE 0xFFFE /* zero header length */
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -38,15 +38,9 @@
#ifndef IEEE80211RADIOTAP_H
#define IEEE80211RADIOTAP_H
-#include <linux/version.h>
#include <linux/if_ether.h>
#include <linux/kernel.h>
-/* Kluge the radiotap linktype for now if we don't have it */
-#ifndef ARPHRD_IEEE80211_RADIOTAP
-#define ARPHRD_IEEE80211_RADIOTAP 803
-#endif
-
/* Radiotap header version (from official NetBSD feed) */
#define IEEE80211RADIOTAP_VERSION "1.5"
/* Base version of the radiotap packet header data */
@@ -74,18 +68,18 @@
/* The radio capture header precedes the 802.11 header. */
struct ieee80211_radiotap_header {
- u_int8_t it_version; /* Version 0. Only increases
+ u8 it_version; /* Version 0. Only increases
* for drastic changes,
* introduction of compatible
* new fields does not count.
*/
- u_int8_t it_pad;
- u_int16_t it_len; /* length of the whole
+ u8 it_pad;
+ u16 it_len; /* length of the whole
* header in bytes, including
* it_version, it_pad,
* it_len, and data fields.
*/
- u_int32_t it_present; /* A bitmap telling which
+ u32 it_present; /* A bitmap telling which
* fields are present. Set bit 31
* (0x80000000) to extend the
* bitmap by another 32 bits.
@@ -97,22 +91,22 @@ struct ieee80211_radiotap_header {
/* Name Data type Units
* ---- --------- -----
*
- * IEEE80211_RADIOTAP_TSFT u_int64_t microseconds
+ * IEEE80211_RADIOTAP_TSFT u64 microseconds
*
* Value in microseconds of the MAC's 64-bit 802.11 Time
* Synchronization Function timer when the first bit of the
* MPDU arrived at the MAC. For received frames, only.
*
- * IEEE80211_RADIOTAP_CHANNEL 2 x u_int16_t MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL 2 x u16 MHz, bitmap
*
* Tx/Rx frequency in MHz, followed by flags (see below).
*
- * IEEE80211_RADIOTAP_FHSS u_int16_t see below
+ * IEEE80211_RADIOTAP_FHSS u16 see below
*
* For frequency-hopping radios, the hop set (first byte)
* and pattern (second byte).
*
- * IEEE80211_RADIOTAP_RATE u_int8_t 500kb/s
+ * IEEE80211_RADIOTAP_RATE u8 500kb/s
*
* Tx/Rx data rate
*
@@ -128,30 +122,30 @@ struct ieee80211_radiotap_header {
* RF noise power at the antenna, decibel difference from one
* milliwatt.
*
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL u_int8_t decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL u8 decibel (dB)
*
* RF signal power at the antenna, decibel difference from an
* arbitrary, fixed reference.
*
- * IEEE80211_RADIOTAP_DB_ANTNOISE u_int8_t decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE u8 decibel (dB)
*
* RF noise power at the antenna, decibel difference from an
* arbitrary, fixed reference point.
*
- * IEEE80211_RADIOTAP_LOCK_QUALITY u_int16_t unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY u16 unitless
*
* Quality of Barker code lock. Unitless. Monotonically
* nondecreasing with "better" lock strength. Called "Signal
* Quality" in datasheets. (Is there a standard way to measure
* this?)
*
- * IEEE80211_RADIOTAP_TX_ATTENUATION u_int16_t unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION u16 unitless
*
* Transmit power expressed as unitless distance from max
* power set at factory calibration. 0 is max power.
* Monotonically nondecreasing with lower power levels.
*
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u_int16_t decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u16 decibels (dB)
*
* Transmit power expressed as decibel distance from max power
* set at factory calibration. 0 is max power. Monotonically
@@ -164,17 +158,17 @@ struct ieee80211_radiotap_header {
* reference). This is the absolute power level measured at
* the antenna port.
*
- * IEEE80211_RADIOTAP_FLAGS u_int8_t bitmap
+ * IEEE80211_RADIOTAP_FLAGS u8 bitmap
*
* Properties of transmitted and received frames. See flags
* defined below.
*
- * IEEE80211_RADIOTAP_ANTENNA u_int8_t antenna index
+ * IEEE80211_RADIOTAP_ANTENNA u8 antenna index
*
* Unitless indication of the Rx/Tx antenna for this packet.
* The first antenna is antenna 0.
*
- * IEEE80211_RADIOTAP_FCS u_int32_t data
+ * IEEE80211_RADIOTAP_FCS u32 data
*
* FCS from frame in network byte order.
*/
---
[1]http://www.fsf.org/licensing/licenses/index_html#GPLCompatibleLicenses
|
