aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-03-28 19:33:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-08 15:05:56 -0400
commit38668c059f5202f5fd9612391f9aa1b38a97241b (patch)
treebf331e19aa1a8a8586b3cc2905c284b6f6b03cbd /include/net/mac80211.h
parent9788ba7500c3a6268ceb63296a0f37f34d450beb (diff)
mac80211: eliminate conf_ht
This patch eliminates the use of conf_ht, replacing it with bss_info_changed. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 48428a6b9109..5174eaa89500 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -178,11 +178,13 @@ struct ieee80211_low_level_stats {
178 * also implies a change in the AID. 178 * also implies a change in the AID.
179 * @BSS_CHANGED_ERP_CTS_PROT: CTS protection changed 179 * @BSS_CHANGED_ERP_CTS_PROT: CTS protection changed
180 * @BSS_CHANGED_ERP_PREAMBLE: preamble changed 180 * @BSS_CHANGED_ERP_PREAMBLE: preamble changed
181 * @BSS_CHANGED_HT: 802.11n parameters changed
181 */ 182 */
182enum ieee80211_bss_change { 183enum ieee80211_bss_change {
183 BSS_CHANGED_ASSOC = 1<<0, 184 BSS_CHANGED_ASSOC = 1<<0,
184 BSS_CHANGED_ERP_CTS_PROT = 1<<1, 185 BSS_CHANGED_ERP_CTS_PROT = 1<<1,
185 BSS_CHANGED_ERP_PREAMBLE = 1<<2, 186 BSS_CHANGED_ERP_PREAMBLE = 1<<2,
187 BSS_CHANGED_HT = 1<<4,
186}; 188};
187 189
188/** 190/**
@@ -195,6 +197,9 @@ enum ieee80211_bss_change {
195 * @aid: association ID number, valid only when @assoc is true 197 * @aid: association ID number, valid only when @assoc is true
196 * @use_cts_prot: use CTS protection 198 * @use_cts_prot: use CTS protection
197 * @use_short_preamble: use 802.11b short preamble 199 * @use_short_preamble: use 802.11b short preamble
200 * @assoc_ht: association in HT mode
201 * @ht_conf: ht capabilities
202 * @ht_bss_conf: ht extended capabilities
198 */ 203 */
199struct ieee80211_bss_conf { 204struct ieee80211_bss_conf {
200 /* association related data */ 205 /* association related data */
@@ -203,6 +208,10 @@ struct ieee80211_bss_conf {
203 /* erp related data */ 208 /* erp related data */
204 bool use_cts_prot; 209 bool use_cts_prot;
205 bool use_short_preamble; 210 bool use_short_preamble;
211 /* ht related data */
212 bool assoc_ht;
213 struct ieee80211_ht_info *ht_conf;
214 struct ieee80211_ht_bss_info *ht_bss_conf;
206}; 215};
207 216
208/** 217/**
@@ -1132,7 +1141,6 @@ struct ieee80211_ops {
1132 struct sk_buff *skb, 1141 struct sk_buff *skb,
1133 struct ieee80211_tx_control *control); 1142 struct ieee80211_tx_control *control);
1134 int (*tx_last_beacon)(struct ieee80211_hw *hw); 1143 int (*tx_last_beacon)(struct ieee80211_hw *hw);
1135 int (*conf_ht)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
1136 int (*ampdu_action)(struct ieee80211_hw *hw, 1144 int (*ampdu_action)(struct ieee80211_hw *hw,
1137 enum ieee80211_ampdu_mlme_action action, 1145 enum ieee80211_ampdu_mlme_action action,
1138 const u8 *addr, u16 tid, u16 *ssn); 1146 const u8 *addr, u16 tid, u16 *ssn);