From: David S. Miller <davem@davemloft.net>
Date: Sat, 23 Jan 2010 08:31:06 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.34-rc1~233^2~534
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=51c24aaacaea90c8e87f1dec75a2ac7622b593f8;p=~emulex%2Finfiniband.git

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

51c24aaacaea90c8e87f1dec75a2ac7622b593f8
diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
index c3f8ec0a38b,de45f308b74..c6120f0b8f9
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@@ -1600,7 -1598,9 +1600,8 @@@ struct iwl_cfg iwl5300_agn_cfg = 
  	.use_bsm = false,
  	.ht_greenfield_support = true,
  	.led_compensation = 51,
+ 	.use_rts_for_ht = true, /* use rts/cts protection */
  	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5100_bgn_cfg = {
@@@ -1668,7 -1669,9 +1670,8 @@@ struct iwl_cfg iwl5100_agn_cfg = 
  	.use_bsm = false,
  	.ht_greenfield_support = true,
  	.led_compensation = 51,
+ 	.use_rts_for_ht = true, /* use rts/cts protection */
  	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5350_agn_cfg = {
@@@ -1691,7 -1694,9 +1694,8 @@@
  	.use_bsm = false,
  	.ht_greenfield_support = true,
  	.led_compensation = 51,
+ 	.use_rts_for_ht = true, /* use rts/cts protection */
  	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_agn_cfg = {
@@@ -1714,7 -1719,9 +1718,8 @@@
  	.use_bsm = false,
  	.ht_greenfield_support = true,
  	.led_compensation = 51,
+ 	.use_rts_for_ht = true, /* use rts/cts protection */
  	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -	.sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_abg_cfg = {
diff --cc lib/vsprintf.c
index add0446dd92,3b8aeec4e32..af4aaa6c36f
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@@ -936,9 -902,8 +936,9 @@@ static char *uuid_string(char *buf, cha
   * - 'i' [46] for 'raw' IPv4/IPv6 addresses
   *       IPv6 omits the colons (01020304...0f)
   *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
 + * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
   * - 'I6c' for IPv6 addresses printed as specified by
-  *       http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt
+  *       http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
   * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
   *       "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   *       Options for %pU are:
diff --cc net/mac80211/mlme.c
index a82564e73d9,05a18f43e1b..1e1d16c55ee
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1478,10 -1963,12 +1478,12 @@@ static void ieee80211_sta_rx_queued_mgm
  			rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
  			break;
  		case IEEE80211_STYPE_ACTION:
- 			/* XXX: differentiate, can only happen for CSA now! */
+ 			if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT)
+ 				break;
+ 
  			ieee80211_sta_process_chanswitch(sdata,
  					&mgmt->u.action.u.chan_switch.sw_elem,
 -					ifmgd->associated);
 +					(void *)ifmgd->associated->priv);
  			break;
  		}
  		mutex_unlock(&ifmgd->mtx);