From ad1b5f42dbbc8b95fd71a96d45248d7b861954e0 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Tue, 20 May 2008 09:56:37 +0200 Subject: [PATCH] --- yaml --- r: 97179 b: refs/heads/master c: 0d580a774b3682b8b2b5c89ab9b813d149ef28e7 h: refs/heads/master i: 97177: fbd9b9c73879f1d3109a16a7b813c6c5d88bb5d1 97175: 5384929943acfe82f938be7a7f4233e0e5c47da1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c88f6562749f..84810a395ff0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e779f0daa5c712439d37b907d58543e4fcf12a +refs/heads/master: 0d580a774b3682b8b2b5c89ab9b813d149ef28e7 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index e470bf12b765..7cfd12e0d1e2 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -730,7 +730,17 @@ static void ieee80211_send_assoc(struct net_device *dev, if (bss->wmm_ie) { wmm = 1; } + + /* get all rates supported by the device and the AP as + * some APs don't like getting a superset of their rates + * in the association request (e.g. D-Link DAP 1353 in + * b-only mode) */ + rates_len = ieee80211_compatible_rates(bss, sband, &rates); + ieee80211_rx_bss_put(dev, bss); + } else { + rates = ~0; + rates_len = sband->n_bitrates; } mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); @@ -761,10 +771,7 @@ static void ieee80211_send_assoc(struct net_device *dev, *pos++ = ifsta->ssid_len; memcpy(pos, ifsta->ssid, ifsta->ssid_len); - /* all supported rates should be added here but some APs - * (e.g. D-Link DAP 1353 in b-only mode) don't like that - * Therefore only add rates the AP supports */ - rates_len = ieee80211_compatible_rates(bss, sband, &rates); + /* add all rates which were marked to be used above */ supp_rates_len = rates_len; if (supp_rates_len > 8) supp_rates_len = 8;