diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 21:14:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:24 -0400 |
commit | 687c7c0807371aeaa94ff2fff511eeb326b5c5de (patch) | |
tree | 5f1a51d7f42dba9718ab7286768a5d3c7a4b4b34 /drivers/net | |
parent | ae17e986091637e7ef5a8224c7b689029b105131 (diff) |
mac80211: share sta_info->ht_info
Rate control algorithms may need access to a station's
HT capabilities, so share the ht_info struct in the
public station API.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index a8711c314e6a..f45a752e93c6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -1154,10 +1154,10 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv, | |||
1154 | s8 is_green = lq_sta->is_green; | 1154 | s8 is_green = lq_sta->is_green; |
1155 | 1155 | ||
1156 | if (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) || | 1156 | if (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) || |
1157 | !sta->ht_info.ht_supported) | 1157 | !sta->sta.ht_info.ht_supported) |
1158 | return -1; | 1158 | return -1; |
1159 | 1159 | ||
1160 | if (((sta->ht_info.cap & IEEE80211_HT_CAP_SM_PS) >> 2) | 1160 | if (((sta->sta.ht_info.cap & IEEE80211_HT_CAP_SM_PS) >> 2) |
1161 | == WLAN_HT_CAP_SM_PS_STATIC) | 1161 | == WLAN_HT_CAP_SM_PS_STATIC) |
1162 | return -1; | 1162 | return -1; |
1163 | 1163 | ||
@@ -1222,7 +1222,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv, | |||
1222 | s32 rate; | 1222 | s32 rate; |
1223 | 1223 | ||
1224 | if (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) || | 1224 | if (!(conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) || |
1225 | !sta->ht_info.ht_supported) | 1225 | !sta->sta.ht_info.ht_supported) |
1226 | return -1; | 1226 | return -1; |
1227 | 1227 | ||
1228 | IWL_DEBUG_RATE("LQ: try to switch to SISO\n"); | 1228 | IWL_DEBUG_RATE("LQ: try to switch to SISO\n"); |