From: David S. Miller <davem@davemloft.net>
Date: Thu, 18 Apr 2019 18:07:55 +0000 (-0700)
Subject: Merge tag 'wireless-drivers-next-for-davem-2019-04-18' of git://git.kernel.org/pub... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9a904efca28bed3b971069398a0c933dd6aaa40;p=linux.git

Merge tag 'wireless-drivers-next-for-davem-2019-04-18' of git://git./linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 5.2

Nothing really special standing out this time, iwlwifi being the most
active driver.

Major changes:

iwlwifi

* send NO_DATA events so they can be captured in radiotap

* support for multiple BSSID

* support for some new FW API versions

* support new hardware

* debugfs cleanups by Greg-KH

qtnfmac

* allow each MAC to specify its own regulatory rules
====================

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

f9a904efca28bed3b971069398a0c933dd6aaa40
diff --cc drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index d8690acee40c0,2235978adf702..1e4c9ef548ccf
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@@ -830,6 -831,8 +830,7 @@@ struct iwl_trans 
  	u32 lmac_error_event_table[2];
  	u32 umac_error_event_table;
  	unsigned int error_event_table_tlv_status;
 -	wait_queue_head_t fw_halt_waitq;
+ 	bool hw_error;
  
  	/* pointer to trans specific struct */
  	/*Ensure that this pointer will always be aligned to sizeof pointer */
diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 9f1af8da9dc18,0329b626ada64..70d0fa0eae2fc
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -953,19 -953,15 +953,16 @@@ static const struct pci_device_id iwl_h
  	{IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
  	{IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)},
  
 -	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl_ax200_cfg_cc)},
  	{IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},
  	{IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x2080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},
 +	{IWL_PCI_DEVICE(0x2723, 0x2080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl_ax200_cfg_cc)},
 +
- 	{IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},
- 	{IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},
- 
  	{IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
  	{IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
  	{IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax210_2ax_cfg_so_hr_a0)},
diff --cc drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 59213164f35e3,860259e655534..4bf745c7bd6cb
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@@ -1043,15 -1027,12 +1027,12 @@@ static inline bool iwl_pcie_dbg_on(stru
  
  void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state);
  void iwl_trans_pcie_dump_regs(struct iwl_trans *trans);
 -void iwl_trans_sync_nmi(struct iwl_trans *trans);
 +void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans);
  
  #ifdef CONFIG_IWLWIFI_DEBUGFS
- int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);
+ void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);
  #else
- static inline int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans)
- {
- 	return 0;
- }
+ static inline void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans) { }
  #endif
  
  int iwl_pci_fw_exit_d0i3(struct iwl_trans *trans);