diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-20 20:34:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-20 20:34:22 -0700 |
| commit | d8ac48d4cbae0cc59b7784399292fbda3e231be3 (patch) | |
| tree | 9fc0adc5c8685e13f2b7208687ae409a98c3f99c /net | |
| parent | d3ede327e83f202c3a0962e207318f65717c5eb7 (diff) | |
| parent | 5d283e8cdb8097b6a3e9304c9c8942ad9dc1a4eb (diff) | |
| download | linux-3.10-d8ac48d4cbae0cc59b7784399292fbda3e231be3.tar.gz linux-3.10-d8ac48d4cbae0cc59b7784399292fbda3e231be3.tar.bz2 linux-3.10-d8ac48d4cbae0cc59b7784399292fbda3e231be3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 15 | ||||
| -rw-r--r-- | net/mac80211/wext.c | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e470bf12b76..7cfd12e0d1e 100644 --- a/net/mac80211/mlme.c +++ b/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; diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 76e1de1dc73..457ebf9e85a 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -209,7 +209,6 @@ static int ieee80211_ioctl_giwrange(struct net_device *dev, range->num_frequency = c; IW_EVENT_CAPA_SET_KERNEL(range->event_capa); - IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWTHRSPY); IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP); IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); |