Merge tag 'wireless-drivers-next-for-davem-2015-08-19' of git://git.kernel.org/pub...

Kalle Valo says:

====================
Major changes:

ath10k:

* add support for qca99x0 family of devices
* improve performance of tx_lock
* add support for raw mode (802.11 frame format) and software crypto
  engine enabled via a module parameter

ath9k:

* add fast-xmit support

wil6210:

* implement TSO support
* support bootloader v1 and onwards

iwlwifi:

* Deprecate -10.ucode
* Clean ups towards multiple Rx queues
* Add support for longer CMD IDs. This will be required by new
  firmwares since we are getting close to the u8 limit.
* bugfixes for the D0i3 power state
* Add basic support for FTM
* polish the Miracast operation
* fix a few power consumption issues
* scan cleanup
* fixes for D0i3 system state
* add paging for devices that support it
* add again the new RBD allocation model
* add more options to the firmware debug system
* add support for frag SKBs in Tx
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --combined drivers/net/wireless/rtlwifi/rtl8723be/sw.c
index 7bf88d9dcdc3fc4732170c121ef78d5a85ca3fa9,3ba1e3218ed2957913a424cd06e6cb85038e2066..d091f1d5f91eb2bbd5f399e01187c7de47cf4aab
--- 1/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
--- 2/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/sw.c
@@@ -209,9 -209,9 +209,9 @@@ bool rtl8723be_get_btc_status(void
        return true;
  }
  
- static bool is_fw_header(struct rtl8723e_firmware_header *hdr)
+ static bool is_fw_header(struct rtlwifi_firmware_header *hdr)
  {
-       return (hdr->signature & 0xfff0) == 0x5300;
+       return (le16_to_cpu(hdr->signature) & 0xfff0) == 0x5300;
  }
  
  static struct rtl_hal_ops rtl8723be_hal_ops = {
@@@ -385,7 -385,6 +385,7 @@@ module_param_named(debug, rtl8723be_mod
  module_param_named(ips, rtl8723be_mod_params.inactiveps, bool, 0444);
  module_param_named(swlps, rtl8723be_mod_params.swctrl_lps, bool, 0444);
  module_param_named(fwlps, rtl8723be_mod_params.fwctrl_lps, bool, 0444);
 +module_param_named(msi, rtl8723be_mod_params.msi_support, bool, 0444);
  module_param_named(disable_watchdog, rtl8723be_mod_params.disable_watchdog,
                   bool, 0444);
  MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");