Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bf9b19 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2016-03-14' of... 

Merge tag 'wireless-drivers-next-for-davem-2016-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers patches for 4.6

Major changes:

rtl8xxxu

* add 8723bu support

wl18xx

* add radar_debug_mode debugfs file for DFS testing
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 20db778e ccfe1e85

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

+2 −4
Original line number Diff line number Diff line
@@ -677,12 +677,10 @@ static void brcmf_pcie_handle_mb_data(struct brcmf_pciedev_info *devinfo) 
		brcmf_dbg(PCIE, "D2H_MB_DATA: DEEP SLEEP EXIT\n");

	if (dtoh_mb_data & BRCMF_D2H_DEV_D3_ACK) {

		brcmf_dbg(PCIE, "D2H_MB_DATA: D3 ACK\n");

		if (waitqueue_active(&devinfo->mbdata_resp_wait)) {

		devinfo->mbdata_completed = true;

		wake_up(&devinfo->mbdata_resp_wait);

	}

}

}





static void brcmf_pcie_bus_console_init(struct brcmf_pciedev_info *devinfo)

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+4 −4
Original line number Diff line number Diff line
@@ -1652,10 +1652,10 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) 


	trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low,

				      table.data1, table.data2, table.line,

				      table.blink1, table.blink2, table.ilink1,

				      table.ilink2, table.bcon_time, table.gp1,

				      table.gp2, table.gp3, table.ucode_ver,

				      table.hw_ver, 0, table.brd_ver);

				      table.blink2, table.ilink1, table.ilink2,

				      table.bcon_time, table.gp1, table.gp2,

				      table.gp3, table.ucode_ver, table.hw_ver,

				      0, table.brd_ver);

	IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id,

		desc_lookup(table.error_id));

	IWL_ERR(priv, "0x%08X | uPc\n", table.pc);

drivers/net/wireless/intel/iwlwifi/iwl-9000.c

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.thermal_params = &iwl9000_tt_params,				\

	.apmg_not_supported = true,					\

	.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true



const struct iwl_cfg iwl9260_2ac_cfg = {

		.name = "Intel(R) Dual Band Wireless AC 9260",

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ struct iwl_pwr_tx_backoff { 
 * @host_interrupt_operation_mode: device needs host interrupt operation

 *	mode set

 * @nvm_hw_section_num: the ID of the HW NVM section

 * @mac_addr_from_csr: read HW address from CSR registers

 * @features: hw features, any combination of feature_whitelist

 * @pwr_tx_backoffs: translation table between power limits and backoffs

 * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response
@@ -345,6 +346,7 @@ struct iwl_cfg { 
	const bool host_interrupt_operation_mode;

	bool high_temp;

	u8   nvm_hw_section_num;

	bool mac_addr_from_csr;

	bool lp_xtal_workaround;

	const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;

	bool no_power_up_nic_in_init;

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+10 −0
Original line number Diff line number Diff line
@@ -598,4 +598,14 @@ enum msix_hw_int_causes { 
#define MSIX_AUTO_CLEAR_CAUSE			0

#define MSIX_NON_AUTO_CLEAR_CAUSE		BIT(7)



/*****************************************************************************

 *                     HW address related registers                          *

 *****************************************************************************/



#define CSR_ADDR_BASE			(0x380)

#define CSR_MAC_ADDR0_OTP		(CSR_ADDR_BASE)

#define CSR_MAC_ADDR1_OTP		(CSR_ADDR_BASE + 4)

#define CSR_MAC_ADDR0_STRAP		(CSR_ADDR_BASE + 8)

#define CSR_MAC_ADDR1_STRAP		(CSR_ADDR_BASE + 0xC)



#endif /* !__iwl_csr_h__ */