diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 21:58:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 21:58:49 -0400 |
| commit | cf3842ec5015c862f4869e3641a8549393bb958e (patch) | |
| tree | 6c2f0158504f3463fcca1359de90b699cb636e97 /include/linux | |
| parent | b3b0b681b12478a7afa7d1f3d58be96830e16c7d (diff) | |
| parent | 63fc33ceb0ccc08b3f62d7bfe56a33eb33ca9427 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index ecd61e8438a5..272f8c8c90da 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -227,6 +227,17 @@ struct ieee80211_cts { | |||
| 227 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10) | 227 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10) |
| 228 | #define WLAN_CAPABILITY_DSSS_OFDM (1<<13) | 228 | #define WLAN_CAPABILITY_DSSS_OFDM (1<<13) |
| 229 | 229 | ||
| 230 | /* 802.11g ERP information element */ | ||
| 231 | #define WLAN_ERP_NON_ERP_PRESENT (1<<0) | ||
| 232 | #define WLAN_ERP_USE_PROTECTION (1<<1) | ||
| 233 | #define WLAN_ERP_BARKER_PREAMBLE (1<<2) | ||
| 234 | |||
| 235 | /* WLAN_ERP_BARKER_PREAMBLE values */ | ||
| 236 | enum { | ||
| 237 | WLAN_ERP_PREAMBLE_SHORT = 0, | ||
| 238 | WLAN_ERP_PREAMBLE_LONG = 1, | ||
| 239 | }; | ||
| 240 | |||
| 230 | /* Status codes */ | 241 | /* Status codes */ |
| 231 | enum ieee80211_statuscode { | 242 | enum ieee80211_statuscode { |
| 232 | WLAN_STATUS_SUCCESS = 0, | 243 | WLAN_STATUS_SUCCESS = 0, |