diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2008-09-13 22:14:26 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-09-15 09:44:48 -0700 |
| commit | b03c643ae4596d2e76e609b5b885e4ccdd86752f (patch) | |
| tree | 99f04e612123425720c6ef34e58544953f763ea0 | |
| parent | 56f9673db912e7509b9b1331f0f692578b542f6b (diff) | |
| download | compat-wireless-2.6-old-b03c643ae4596d2e76e609b5b885e4ccdd86752f.tar.gz | |
Backport mac80211: change MIMO_PS to SM_PS
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
| -rw-r--r-- | include/linux/ieee80211.h | 12 | ||||
| -rw-r--r-- | net/mac80211/main.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index a1630ba..d72995f 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -695,7 +695,7 @@ struct ieee80211_ht_addt_info { /* 802.11n HT capabilities masks */ #define IEEE80211_HT_CAP_SUP_WIDTH 0x0002 -#define IEEE80211_HT_CAP_MIMO_PS 0x000C +#define IEEE80211_HT_CAP_SM_PS 0x000C #define IEEE80211_HT_CAP_GRN_FLD 0x0010 #define IEEE80211_HT_CAP_SGI_20 0x0020 #define IEEE80211_HT_CAP_SGI_40 0x0040 @@ -723,11 +723,11 @@ struct ieee80211_ht_addt_info { #define IEEE80211_HT_IE_NON_GF_STA_PRSNT 0x0004 #define IEEE80211_HT_IE_NON_HT_STA_PRSNT 0x0010 -/* MIMO Power Save Modes */ -#define WLAN_HT_CAP_MIMO_PS_STATIC 0 -#define WLAN_HT_CAP_MIMO_PS_DYNAMIC 1 -#define WLAN_HT_CAP_MIMO_PS_INVALID 2 -#define WLAN_HT_CAP_MIMO_PS_DISABLED 3 +/* Spatial Multiplexing Power Save Modes */ +#define WLAN_HT_CAP_SM_PS_STATIC 0 +#define WLAN_HT_CAP_SM_PS_DYNAMIC 1 +#define WLAN_HT_CAP_SM_PS_INVALID 2 +#define WLAN_HT_CAP_SM_PS_DISABLED 3 /* Authentication algorithms */ #define WLAN_AUTH_OPEN 0 diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 261718a..49a94c7 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1114,8 +1114,8 @@ u32 ieee80211_handle_ht(struct ieee80211_local *local, int enable_ht, ht_conf.ht_supported = 1; ht_conf.cap = req_ht_cap->cap & sband->ht_info.cap; - ht_conf.cap &= ~(IEEE80211_HT_CAP_MIMO_PS); - ht_conf.cap |= sband->ht_info.cap & IEEE80211_HT_CAP_MIMO_PS; + ht_conf.cap &= ~(IEEE80211_HT_CAP_SM_PS); + ht_conf.cap |= sband->ht_info.cap & IEEE80211_HT_CAP_SM_PS; ht_bss_conf.primary_channel = req_bss_cap->primary_channel; ht_bss_conf.bss_cap = req_bss_cap->bss_cap; ht_bss_conf.bss_op_mode = req_bss_cap->bss_op_mode; |