From: David S. Miller <davem@davemloft.net>
Date: Mon, 7 Aug 2017 18:34:41 +0000 (-0700)
Subject: Merge tag 'wireless-drivers-next-for-davem-2017-08-07' of git://git.kernel.org/pub... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46d4b68f891bee5d83a32508bfbd9778be6b1b63;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'wireless-drivers-next-for-davem-2017-08-07' of git://git./linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 4.14

The first wireless-drivers-next pull request for 4.14. I'm submitting
this unusally late in the cycle as my vacation postponed this. But
even if this is late there's not still that much new features, mostly
cleanup or fixes.

Major changes:

ath10k

* preparation for wcn3990 support

iwlwifi

* Reorganization of the code into separate directories continues

qtnfmac

* regulatory support updates

* add get_channel, dump_survey and channel_switch cfg80211 handlers
====================

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

46d4b68f891bee5d83a32508bfbd9778be6b1b63
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 79e7a7a285dc,ff44e1aa035e..875cf3a60adb
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@@ -1048,8 -614,8 +614,8 @@@ static union acpi_object *iwl_mvm_sar_f
  						    union acpi_object *data,
  						    int data_size)
  {
++	union acpi_object *wifi_pkg = NULL;
  	int i;
--	union acpi_object *wifi_pkg;
  
  	/*
  	 * We need at least two packages, one for the revision and one
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 9c175d5e9d67,c387d5095bfe..9c9c1b4b6d48
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@@ -1234,9 -1190,10 +1190,9 @@@ void iwl_mvm_nic_restart(struct iwl_mv
  	 * can't recover this since we're already half suspended.
  	 */
  	if (!mvm->fw_restart && fw_error) {
- 		iwl_mvm_fw_dbg_collect_desc(mvm, &iwl_mvm_dump_desc_assert,
+ 		iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
  					NULL);
 -	} else if (test_and_set_bit(IWL_MVM_STATUS_IN_HW_RESTART,
 -				    &mvm->status)) {
 +	} else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
  		struct iwl_mvm_reprobe *reprobe;
  
  		IWL_ERR(mvm,