aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2008-12-12 01:27:43 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-19 15:22:54 -0500
commit094d05dc32fc2930e381189a942016e5561775d9 (patch)
tree4deedbcbe196f88cb8d9fe0cd0755775a7ff0939 /net/mac80211/ht.c
parent420e7fabd9c6d907280ed6b3e40eef425c5d8d8d (diff)
mac80211: Fix HT channel selection
HT management is done differently for AP and STA modes, unify to just the ->config() callback since HT is fundamentally a PHY property and cannot be per-BSS. Rename enum nl80211_sec_chan_offset as nl80211_channel_type to denote the channel type ( NO_HT, HT20, HT40+, HT40- ). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r--net/mac80211/ht.c35
1 files changed, 24 insertions, 11 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index a1eed7032c9..5f510a13b9f 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -98,6 +98,7 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
98 struct ieee80211_bss_ht_conf ht; 98 struct ieee80211_bss_ht_conf ht;
99 u32 changed = 0; 99 u32 changed = 0;
100 bool enable_ht = true, ht_changed; 100 bool enable_ht = true, ht_changed;
101 enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
101 102
102 sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; 103 sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
103 104
@@ -112,24 +113,36 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
112 ieee80211_channel_to_frequency(hti->control_chan)) 113 ieee80211_channel_to_frequency(hti->control_chan))
113 enable_ht = false; 114 enable_ht = false;
114 115
115 /* 116 if (enable_ht) {
116 * XXX: This is totally incorrect when there are multiple virtual 117 channel_type = NL80211_CHAN_HT20;
117 * interfaces, needs to be fixed later. 118
118 */ 119 if (!(ap_ht_cap_flags & IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
119 ht_changed = local->hw.conf.ht.enabled != enable_ht; 120 (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
121 (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) {
122 switch(hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
123 case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
124 channel_type = NL80211_CHAN_HT40PLUS;
125 break;
126 case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
127 channel_type = NL80211_CHAN_HT40MINUS;
128 break;
129 }
130 }
131 }
132
133 ht_changed = local->hw.conf.ht.enabled != enable_ht ||
134 channel_type != local->hw.conf.ht.channel_type;
135
136 local->oper_channel_type = channel_type;
120 local->hw.conf.ht.enabled = enable_ht; 137 local->hw.conf.ht.enabled = enable_ht;
138
121 if (ht_changed) 139 if (ht_changed)
122 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT); 140 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);
123 141
124 /* disable HT */ 142 /* disable HT */
125 if (!enable_ht) 143 if (!enable_ht)
126 return 0; 144 return 0;
127 ht.secondary_channel_offset = 145
128 hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET;
129 ht.width_40_ok =
130 !(ap_ht_cap_flags & IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
131 (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
132 (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY);
133 ht.operation_mode = le16_to_cpu(hti->operation_mode); 146 ht.operation_mode = le16_to_cpu(hti->operation_mode);
134 147
135 /* if bss configuration changed store the new one */ 148 /* if bss configuration changed store the new one */