libertas: move radiotap definitions to
include/net/ieee80211_radiotap.h
Marcelo Tosatti
mtosatti at redhat.unroutablecom
Sun Dec 24 04:30:49 EST 2006
Commit: 14d633bd54657f4818ccf1c5ed7cb639e19c3e27
Parent: 9ed51a47c17d271cddde031c368da395a7e64908
commit 14d633bd54657f4818ccf1c5ed7cb639e19c3e27
Author: Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Mon Dec 18 17:53:51 2006 -0200
Commit: Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Mon Dec 18 17:53:51 2006 -0200
libertas: move radiotap definitions to include/net/ieee80211_radiotap.h
Subject says it all.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
drivers/net/wireless/libertas/radiotap.h | 10 ----------
include/net/ieee80211_radiotap.h | 8 ++++++++
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index f8c9f26..3e5aba8 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -19,16 +19,6 @@
#include <net/ieee80211_radiotap.h>
-/* XXX: move to net/ieee_80211_radiotap.h, this are from the new header file */
-/* For IEEE80211_RADIOTAP_RX_FLAGS */
-#define IEEE80211_RADIOTAP_F_RX_BADFCS 0x0001 /* frame failed crc check */
-
-/* For IEEE80211_RADIOTAP_TX_FLAGS */
-#define IEEE80211_RADIOTAP_F_TX_FAIL 0x0001 /* failed due to excessive
- * retries */
-#define IEEE80211_RADIOTAP_F_TX_CTS 0x0002 /* used cts 'protection' */
-#define IEEE80211_RADIOTAP_F_TX_RTS 0x0004 /* used rts/cts handshake */
-
struct IEEE80211_Hdr {
u16 FrameControl;
u16 DurationID;
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 4af40f8..c6e0d81 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -240,6 +240,14 @@ #define IEEE80211_RADIOTAP_F_DATAPAD 0x2
* 802.11 header and payload
* (to 32-bit boundary)
*/
+/* For IEEE80211_RADIOTAP_RX_FLAGS */
+#define IEEE80211_RADIOTAP_F_RX_BADFCS 0x0001 /* frame failed crc check */
+
+/* For IEEE80211_RADIOTAP_TX_FLAGS */
+#define IEEE80211_RADIOTAP_F_TX_FAIL 0x0001 /* failed due to excessive
+ * retries */
+#define IEEE80211_RADIOTAP_F_TX_CTS 0x0002 /* used cts 'protection' */
+#define IEEE80211_RADIOTAP_F_TX_RTS 0x0004 /* used rts/cts handshake */
/* Ugly macro to convert literal channel numbers into their mhz equivalents
* There are certianly some conditions that will break this (like feeding it '30')
More information about the Commits-kernel
mailing list