From: David S. Miller <davem@davemloft.net>
Date: Mon, 26 May 2008 06:26:10 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~408
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=43154d08d6bb5c69aa0d0e3448fb348b4cd84e91;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
---

43154d08d6bb5c69aa0d0e3448fb348b4cd84e91
diff --cc net/mac80211/mlme.c
index 7877d3b3f4c,7cfd12e0d1e..3f7f92a2f22
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -719,9 -727,20 +719,19 @@@ static void ieee80211_send_assoc(struc
  	if (bss) {
  		if (bss->capability & WLAN_CAPABILITY_PRIVACY)
  			capab |= WLAN_CAPABILITY_PRIVACY;
 -		if (bss->wmm_ie) {
 +		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);