d80211: merge d80211_shared.h into d80211.h
Subsystems (2)
PATCH 2/4 d80211: merge d80211_shared.h into d80211.h
merge d80211_shared.h into d80211.h
This merges d80211_shared.h into d80211.h.
Signed-off-by Michael Wu <[email protected]>
---
include/net/d80211.h | 32 +++++++++++++++++++++++++++++- include/net/d80211_shared.h | 46 ------------------------------------------- 2 files changed, 31 insertions(+), 47 deletions(-)
include/net/d80211.h +31 -1
@@ -16,7 +16,6 @@#include <linux/wireless.h> #include <linux/device.h> #include <linux/ieee80211.h> -#include "d80211_shared.h" /* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be * called in hardware interrupt context. The low-level driver must not call any
@@ -47,6 +46,10 @@#define IEEE80211_VERSION 2 +#define IEEE80211_CHAN_W_SCAN 0x00000001 +#define IEEE80211_CHAN_W_ACTIVE_SCAN 0x00000002 +#define IEEE80211_CHAN_W_IBSS 0x00000004 +/* Channel information structure. Low-level driver is expected to fill in chan, * freq, and val fields. Other fields will be filled in by 80211.o based on * hostapd information and low-level driver does not need to use them. The
@@ -61,6 +64,22 @@ struct ieee80211_channel {unsigned char antenna_max; }; +#define IEEE80211_RATE_ERP 0x00000001 +#define IEEE80211_RATE_BASIC 0x00000002 +#define IEEE80211_RATE_PREAMBLE2 0x00000004 +#define IEEE80211_RATE_SUPPORTED 0x00000010 +#define IEEE80211_RATE_OFDM 0x00000020 +#define IEEE80211_RATE_CCK 0x00000040 +#define IEEE80211_RATE_TURBO 0x00000080 +#define IEEE80211_RATE_MANDATORY 0x00000100 + +#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2) +#define IEEE80211_RATE_MODULATION (f) \ +(f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM)) + +/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags. +* BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the +* configuration. */ struct ieee80211_rate {int rate;/* rate in 100 kbps */ int val;/* hw specific value for the rate */
@@ -77,6 +96,17 @@ struct ieee80211_rate {* optimizing channel utilization estimates */ }; +/* 802.11g is backwards-compatible with 802.11b, so a wlan card can +* actually be both in 11b and 11g modes at the same time. */ +enum { +MODE_IEEE80211A =0 /* IEEE 802.11a */ , +MODE_IEEE80211B =1 /* IEEE 802.11b only */ , +MODE_ATHEROS_TURBO =2 /* Atheros Turbo mode (2x.11a at 5 GHz) */ , +MODE_IEEE80211G =3 /* IEEE 802.11g (and 802.11b compatibility) */ , +MODE_ATHEROS_TURBOG =4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */ , +NUM_IEEE80211_MODES =5 +}; +struct ieee80211_hw_modes {int mode;int num_channels;
include/net/d80211_shared.h deleted +0 -46
46 lines not on this page · raw message