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

Commit 65574866 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents b70727e8 adaf6918

drivers/net/wireless/iwlwifi/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -7,14 +7,16 @@ iwlwifi-objs += iwl-notif-wait.o 
iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o iwl-7000.o

iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o



iwlwifi-objs += $(iwlwifi-m)



iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o



ccflags-y += -D__CHECK_ENDIAN__ -I$(src)





obj-$(CONFIG_IWLDVM)	+= dvm/

obj-$(CONFIG_IWLMVM)	+= mvm/

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

+0 −7
Original line number Diff line number Diff line
@@ -1859,14 +1859,9 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
		return pos;

	}



#ifdef CONFIG_IWLWIFI_DEBUG

	if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)

		size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)

			? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;

#else

	size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)

		? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;

#endif

	IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n",

		size);
@@ -1910,10 +1905,8 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
	unsigned int reload_msec;

	unsigned long reload_jiffies;



#ifdef CONFIG_IWLWIFI_DEBUG

	if (iwl_have_debug_level(IWL_DL_FW_ERRORS))

		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);

#endif



	/* uCode is no longer loaded. */

	priv->ucode_loaded = false;

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

+4 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ struct iwl_cfg { 
/*

 * This list declares the config structures for all devices.

 */

#if IS_ENABLED(CONFIG_IWLDVM)

extern const struct iwl_cfg iwl5300_agn_cfg;

extern const struct iwl_cfg iwl5100_agn_cfg;

extern const struct iwl_cfg iwl5350_agn_cfg;
@@ -278,11 +279,14 @@ extern const struct iwl_cfg iwl6035_2agn_cfg; 
extern const struct iwl_cfg iwl105_bgn_cfg;

extern const struct iwl_cfg iwl105_bgn_d_cfg;

extern const struct iwl_cfg iwl135_bgn_cfg;

#endif /* CONFIG_IWLDVM */

#if IS_ENABLED(CONFIG_IWLMVM)

extern const struct iwl_cfg iwl7260_2ac_cfg;

extern const struct iwl_cfg iwl7260_2n_cfg;

extern const struct iwl_cfg iwl7260_n_cfg;

extern const struct iwl_cfg iwl3160_2ac_cfg;

extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

drivers/net/wireless/iwlwifi/iwl-debug.h

+4 −0
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ 


static inline bool iwl_have_debug_level(u32 level)

{

#ifdef CONFIG_IWLWIFI_DEBUG

	return iwlwifi_mod_params.debug_level & level;

#else

	return false;

#endif

}



void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace,

drivers/net/wireless/iwlwifi/iwl-modparams.h

+2 −0
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ struct iwl_mod_params { 
	int led_mode;

	bool power_save;

	int power_level;

#ifdef CONFIG_IWLWIFI_DEBUG

	u32 debug_level;

#endif

	int ant_coupling;

	bool bt_ch_announce;

	bool auto_agg;