Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Thu, 15 Apr 2010 20:21:34 +0000 (16:21 -0400)]
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c

70 files changed:
1  2 
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ath5k/attach.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/virtual.c
drivers/net/wireless/ath/regd.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-calib.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-io.h
drivers/net/wireless/iwlwifi/iwl-power.c
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/prism54/islpci_dev.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/net/wireless/prism54/islpci_mgt.c
drivers/net/wireless/prism54/oid_mgt.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/wl12xx/wl1251_main.c
drivers/net/wireless/wl12xx/wl1251_spi.c
drivers/net/wireless/wl12xx/wl1271_acx.c
drivers/net/wireless/wl12xx/wl1271_boot.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_init.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_rx.c
drivers/net/wireless/wl12xx/wl1271_spi.c
include/linux/mmc/sdio.h
include/net/mac80211.h
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/cfg.c
net/mac80211/debugfs_netdev.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/mesh.c
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_plink.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/work.c
net/wireless/mlme.c
net/wireless/nl80211.c
net/wireless/reg.c
net/wireless/sme.c
net/wireless/util.c

@@@ -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>
 -
 -----------------------------
@@@ -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;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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) {
  
  #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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge