From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 Apr 2010 20:21:34 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c01d5669356e13f0fb468944c1dd4c6a7e978ad;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/wl12xx/wl1271_main.c
---

5c01d5669356e13f0fb468944c1dd4c6a7e978ad
diff --cc Documentation/feature-removal-schedule.txt
index 267e90582d20,5f460110c5ee..116a13c4f13f
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -572,39 -571,23 +571,60 @@@ Who:	Jan Kiszka <jan.kiszka@web.de
  
  ----------------------------
  
 +What:	KVM memory aliases support
 +When:	July 2010
 +Why:	Memory aliasing support is used for speeding up guest vga access
 +	through the vga windows.
 +
 +	Modern userspace no longer uses this feature, so it's just bitrotted
 +	code and can be removed with no impact.
 +Who:	Avi Kivity <avi@redhat.com>
 +
 +----------------------------
 +
 +What:	KVM kernel-allocated memory slots
 +When:	July 2010
 +Why:	Since 2.6.25, kvm supports user-allocated memory slots, which are
 +	much more flexible than kernel-allocated slots.  All current userspace
 +	supports the newer interface and this code can be removed with no
 +	impact.
 +Who:	Avi Kivity <avi@redhat.com>
 +
 +----------------------------
 +
 +What:	KVM paravirt mmu host support
 +When:	January 2011
 +Why:	The paravirt mmu host support is slower than non-paravirt mmu, both
 +	on newer and older hardware.  It is already not exposed to the guest,
 +	and kept only for live migration purposes.
 +Who:	Avi Kivity <avi@redhat.com>
 +
 +----------------------------
 +
 +What: 	"acpi=ht" boot option
 +When:	2.6.35
 +Why:	Useful in 2003, implementation is a hack.
 +	Generally invoked by accident today.
 +	Seen as doing more harm than good.
 +Who:	Len Brown <len.brown@intel.com>
++
++----------------------------
++
+ What:	iwlwifi 50XX module parameters
+ When:	2.6.40
+ Why:	The "..50" modules parameters were used to configure 5000 series and
+ 	up devices; different set of module parameters also available for 4965
+ 	with same functionalities. Consolidate both set into single place
+ 	in drivers/net/wireless/iwlwifi/iwl-agn.c
+ 
+ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
+ 
+ ----------------------------
+ 
+ What:	iwl4965 alias support
+ When:	2.6.40
+ Why:	Internal alias support has been present in module-init-tools for some
+ 	time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
+ 	with no impact.
+ 
+ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 -
 -----------------------------
diff --cc drivers/net/wireless/ath/ar9170/main.c
index 7c4a7d84535c,fed6695ec04e..0312cee39570
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@@ -2509,10 -2513,10 +2510,10 @@@ void *ar9170_alloc(size_t priv_size
  	/*
  	 * this buffer is used for rx stream reconstruction.
  	 * Under heavy load this device (or the transport layer?)
 -	 * tends to split the streams into seperate rx descriptors.
 +	 * tends to split the streams into separate rx descriptors.
  	 */
  
- 	skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL);
+ 	skb = __dev_alloc_skb(AR9170_RX_STREAM_MAX_SIZE, GFP_KERNEL);
  	if (!skb)
  		goto err_nomem;
  
diff --cc drivers/net/wireless/wl12xx/wl1271_main.c
index aa970b759dd5,283d5dade1ae..814f300c3f17
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@@ -1267,11 -1304,15 +1305,16 @@@ struct wl1271_filter_params 
  	u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
 -static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
 -				       struct dev_addr_list *mc_list)
 +static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw,
 +				       struct netdev_hw_addr_list *mc_list)
  {
  	struct wl1271_filter_params *fp;
 +	struct netdev_hw_addr *ha;
+ 	struct wl1271 *wl = hw->priv;
+ 	int i;
+ 
+ 	if (unlikely(wl->state == WL1271_STATE_OFF))
+ 		return 0;
  
  	fp = kzalloc(sizeof(*fp), GFP_ATOMIC);
  	if (!fp) {
diff --cc include/linux/mmc/sdio.h
index 0ebaef577ff5,118f0295a575..329a8faa6e37
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@@ -94,9 -94,9 +94,11 @@@
  
  #define  SDIO_BUS_WIDTH_1BIT	0x00
  #define  SDIO_BUS_WIDTH_4BIT	0x02
+ #define  SDIO_BUS_ECSI		0x20	/* Enable continuous SPI interrupt */
+ #define  SDIO_BUS_SCSI		0x40	/* Support continuous SPI interrupt */
  
 +#define  SDIO_BUS_ASYNC_INT	0x20
 +
  #define  SDIO_BUS_CD_DISABLE     0x80	/* disable pull-up on DAT3 (pin 1) */
  
  #define SDIO_CCCR_CAPS		0x08