diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-03 07:43:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-03 07:43:34 -0500 |
| commit | a80f509f4a4f41ea8693733124470ad63a12664a (patch) | |
| tree | b32c1412837a0041800b1dfdc0abd65685b0bc71 /include | |
| parent | 246f19d194ec99ee8992106e129a133142dc6a10 (diff) | |
| parent | 04a9e451fdbbfb84d6b87042b991f729f1c14249 (diff) | |
Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 5de6d911cdf7..f577c8f1c66d 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -287,6 +287,12 @@ struct ieee80211_ht_addt_info { | |||
| 287 | #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 | 287 | #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 |
| 288 | #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 | 288 | #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 |
| 289 | 289 | ||
| 290 | /* MIMO Power Save Modes */ | ||
| 291 | #define WLAN_HT_CAP_MIMO_PS_STATIC 0 | ||
| 292 | #define WLAN_HT_CAP_MIMO_PS_DYNAMIC 1 | ||
| 293 | #define WLAN_HT_CAP_MIMO_PS_INVALID 2 | ||
| 294 | #define WLAN_HT_CAP_MIMO_PS_DISABLED 3 | ||
| 295 | |||
| 290 | /* Authentication algorithms */ | 296 | /* Authentication algorithms */ |
| 291 | #define WLAN_AUTH_OPEN 0 | 297 | #define WLAN_AUTH_OPEN 0 |
| 292 | #define WLAN_AUTH_SHARED_KEY 1 | 298 | #define WLAN_AUTH_SHARED_KEY 1 |