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

Commit 8b3cf6ec authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-01-31_2' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-01-31_2' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Here's a first batch of patches for 4.6:
* continue the work on multiple Rx queues (Sara)
* add support for beacon storing
  used in low power states (Sara)
* cleanups (Rodrigo, Johannes)
* fix the LED behavior for iwldvm (Hubert)
* Use the regular firmware image of WoWLAN (Matti)
* fix 8000 devices for Big Endian machines (Johannes)
* more firmware debug hooks (Golan)
* add support for P2P Client snoozing (Avri)
* make the beacon filtering for AP mode configurable (Andrei)
* fix transmit queues overflow with LSO
parents a92277bc c89e333d

drivers/net/wireless/intel/iwlwifi/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -99,6 +99,18 @@ config IWLWIFI_UAPSD 


	  If unsure, say N.



config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM

       default false

       help

         Say Y here to enable runtime power management for PCIe

         devices.  If enabled, the device will go into low power mode

         when idle for a short period of time, allowing for improved

         power saving during runtime.



	 If unsure, say N.



menu "Debugging Options"



config IWLWIFI_DEBUG

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

+4 −1
Original line number Diff line number Diff line
@@ -152,11 +152,14 @@ static void iwl_led_brightness_set(struct led_classdev *led_cdev, 
{

	struct iwl_priv *priv = container_of(led_cdev, struct iwl_priv, led);

	unsigned long on = 0;

	unsigned long off = 0;



	if (brightness > 0)

		on = IWL_LED_SOLID;

	else

		off = IWL_LED_SOLID;



	iwl_led_cmd(priv, on, 0);

	iwl_led_cmd(priv, on, off);

}



static int iwl_led_blink_set(struct led_classdev *led_cdev,

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

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw, 
	iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET,

		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	iwl_trans_d3_suspend(priv->trans, false);

	iwl_trans_d3_suspend(priv->trans, false, true);



	goto out;
@@ -469,7 +469,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
	/* we'll clear ctx->vif during iwlagn_prepare_restart() */

	vif = ctx->vif;



	ret = iwl_trans_d3_resume(priv->trans, &d3_status, false);

	ret = iwl_trans_d3_resume(priv->trans, &d3_status, false, true);

	if (ret)

		goto out_unlock;

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

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.smem_offset = IWL9000_SMEM_OFFSET,				\

	.smem_len = IWL9000_SMEM_LEN,					\

	.thermal_params = &iwl9000_tt_params,				\

	.apmg_not_supported = true

	.apmg_not_supported = true,					\

	.mq_rx_supported = 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
@@ -311,6 +311,7 @@ struct iwl_pwr_tx_backoff { 
 * @dccm2_len: length of the second DCCM

 * @smem_offset: offset from which the SMEM begins

 * @smem_len: the length of SMEM

 * @mq_rx_supported: multi-queue rx support

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -362,6 +363,7 @@ struct iwl_cfg { 
	const u32 smem_len;

	const struct iwl_tt_params *thermal_params;

	bool apmg_not_supported;

	bool mq_rx_supported;

};



/*