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

diff --cc drivers/net/dm9000.c
Simple merge

diff --cc drivers/net/pcnet32.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/s2io.h
Simple merge

diff --cc drivers/net/sb1250-mac.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge

diff --cc drivers/net/tokenring/3c359.h
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc drivers/net/wireless/rtl8187_dev.c
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv4/ipip.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/mac80211/mlme.c
index 7877d3b3f4cbf57ca7cb9e4c86abf4d7f55933e0,7cfd12e0d1e24971735848f3e427dfcfcb1735e1..3f7f92a2f227f5244463f4564e4311c872e647ab
--- 1/net/mac80211/mlme.c
--- 2/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);

diff --cc net/mac80211/wext.c
Simple merge