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

Commit 5ef15ccc authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: rename CONFIG_IWLWIFI_DEVICE_SVTOOL to CONFIG_IWLWIFI_DEVICE_TESTMODE 



Change the name to match the works

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent c4db6166

drivers/net/wireless/iwlwifi/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ config IWLWIFI_DEVICE_TRACING 
	  occur.

endmenu



config IWLWIFI_DEVICE_SVTOOL

config IWLWIFI_DEVICE_TESTMODE

	def_bool y

	depends on IWLWIFI

	depends on NL80211_TESTMODE

	help

	  This option enables the svtool support for iwlwifi device through

	  NL80211_TESTMODE. svtool is a software validation tool that runs in

	  the user space and interacts with the device in the kernel space

	  through the generic netlink message via NL80211_TESTMODE channel.
 
	  This option enables the testmode support for iwlwifi device through

	  NL80211_TESTMODE. This provide the capabilities of enable user space

	  validation applications to interacts with the device through the

	  generic netlink message via NL80211_TESTMODE channel.

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ iwlwifi-objs += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o 


iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

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

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-testmode.o

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



CFLAGS_iwl-devtrace.o := -I$(src)

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void rs_program_fix_rate(struct iwl_priv *priv, 
	lq_sta->active_mimo2_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */

	lq_sta->active_mimo3_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */



#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

	/* testmode has higher priority to overwirte the fixed rate */

	if (priv->tm_fixed_rate)

		lq_sta->dbg_fixed_rate = priv->tm_fixed_rate;
@@ -1081,7 +1081,7 @@ done: 
	if (sta && sta->supp_rates[sband->band])

		rs_rate_scale_perform(priv, skb, sta, lq_sta);



#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_IWLWIFI_DEVICE_SVTOOL)

#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_IWLWIFI_DEVICE_TESTMODE)

	if ((priv->tm_fixed_rate) &&

	    (priv->tm_fixed_rate != lq_sta->dbg_fixed_rate))

		rs_program_fix_rate(priv, lq_sta);
@@ -2904,7 +2904,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i 
	if (sband->band == IEEE80211_BAND_5GHZ)

		lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;

	lq_sta->is_agg = 0;

#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

	priv->tm_fixed_rate = 0;

#endif

#ifdef CONFIG_MAC80211_DEBUGFS

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, 
	if (ieee80211_is_data(fc)) {

		tx_cmd->initial_rate_index = 0;

		tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK;

#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

		if (priv->tm_fixed_rate) {

			/*

			 * rate overwrite by testmode

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −2
Original line number Diff line number Diff line
@@ -1703,8 +1703,8 @@ static void iwl_debug_config(struct iwl_priv *priv) 
		"disabled\n");

#endif



	dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_SVTOOL "

#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL

	dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TESTMODE "

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

		"enabled\n");

#else

		"disabled\n");