• David S. Miller's avatar
    Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of... · c8ac18f2
    David S. Miller authored
    Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
    
    Major changes:
    
    iwlwifi:
    
    * more work for new devices (4165 / 8260)
    * cleanups / improvemnts in rate control
    * fixes for TDLS
    * major statistics work from Johannes - more to come
    * improvements for the fw error dump infrastructure
    * usual amount of small fixes here and there (scan, D0i3 etc...)
    * add support for beamforming
    * enable stuck queue detection for iwlmvm
    * a few fixes for EBS scan
    * fixes for various failure paths
    * improvements for TDLS Offchannel
    
    wil6210:
    
    * performance tuning
    * some AP features
    
    brcm80211:
    
    * rework some code in SDIO part of the brcmfmac driver related to
      suspend/resume that were found doing stress testing
    * in PCIe part scheduling of worker thread needed to be relaxed
    * minor fixes and exposing firmware revision information to
      user-space, ie. ethtool.
    
    mwifiex:
    
    * enhancements for change virtual interface handling
    * remove coupling between netdev and FW supported interface
      combination, now conversion from any type of supported interface
      types to any other type is possible
    * DFS support in AP mode
    
    ath9k:
    
    * fix calibration issues on some boards
    * Wake-on-WLAN improvements
    
    ath10k:
    
    * add support for qca6174 hardware
    * enable RX batching to reduce CPU load
    
    Conflicts:
    	drivers/net/wireless/rtlwifi/pci.c
    
    Conflict resolution is to get rid of the 'end' label and keep
    the rest.
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    c8ac18f2
main.c 62.5 KB