aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/work.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-04-28 11:03:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-28 16:50:29 -0400
commit76f273640134f3eb8257179cd5b3bc6ba5fe4a96 (patch)
tree827c91fee5a626a76af30a1f48d65e1d429abed2 /net/mac80211/work.c
parentf0b058b61711ebf5be94d6865ca7b2c259b71d37 (diff)
mac80211: fix supported rates IE if AP doesn't give us it's rates
If AP do not provide us supported rates before assiociation, send all rates we are supporting instead of empty information element. v1 -> v2: Add comment. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/work.c')
-rw-r--r--net/mac80211/work.c28
1 files changed, 19 insertions, 9 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index 7bd8670379de..4c7de72c27e7 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -212,15 +212,25 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
212 212
213 sband = local->hw.wiphy->bands[wk->chan->band]; 213 sband = local->hw.wiphy->bands[wk->chan->band];
214 214
215 /* 215 if (wk->assoc.supp_rates_len) {
216 * Get all rates supported by the device and the AP as 216 /*
217 * some APs don't like getting a superset of their rates 217 * Get all rates supported by the device and the AP as
218 * in the association request (e.g. D-Link DAP 1353 in 218 * some APs don't like getting a superset of their rates
219 * b-only mode)... 219 * in the association request (e.g. D-Link DAP 1353 in
220 */ 220 * b-only mode)...
221 rates_len = ieee80211_compatible_rates(wk->assoc.supp_rates, 221 */
222 wk->assoc.supp_rates_len, 222 rates_len = ieee80211_compatible_rates(wk->assoc.supp_rates,
223 sband, &rates); 223 wk->assoc.supp_rates_len,
224 sband, &rates);
225 } else {
226 /*
227 * In case AP not provide any supported rates information
228 * before association, we send information element(s) with
229 * all rates that we support.
230 */
231 rates = ~0;
232 rates_len = sband->n_bitrates;
233 }
224 234
225 skb = alloc_skb(local->hw.extra_tx_headroom + 235 skb = alloc_skb(local->hw.extra_tx_headroom +
226 sizeof(*mgmt) + /* bit too much but doesn't matter */ 236 sizeof(*mgmt) + /* bit too much but doesn't matter */