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

Commit 2befc4e0 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-05-10' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* work for RX multiqueue continues (Sara);
* dynamic queue allocation work continues (Liad);
* add Luca as maintainer;
* a bunch of fixes and improvements all over;
parents 251a9605 af5e964f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5831,6 +5831,7 @@ F: drivers/net/wireless/intel/iwlegacy/ 
INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>

M:	Luca Coelho <luciano.coelho@intel.com>

M:	Intel Linux Wireless <linuxwifi@intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -134,12 +134,6 @@ config IWLWIFI_DEBUGFS 
	  is a low-impact option that allows getting insight into the

	  driver's state at runtime.



config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

        bool "Experimental uCode support"

        depends on IWLWIFI_DEBUG

        ---help---

	  Enable use of experimental ucode for testing and debugging.



config IWLWIFI_DEVICE_TRACING

	bool "iwlwifi device access tracing"

	depends on EVENT_TRACING

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
static const struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.pll_cfg = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.led_compensation = 51,

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

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -76,7 +75,6 @@ static const struct iwl_base_params iwl2000_base_params = { 
static const struct iwl_base_params iwl2030_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.led_compensation = 57,

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
static const struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.pll_cfg = true,

	.led_compensation = 51,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

	.max_event_log_size = 512,