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

Commit 7aafef1c authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: name changed from "fat" to "ht40" 



Rename "fat" to "ht40"
The term "fat channel" is deprecated in favor of "HT40"

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3d816c77

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

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static struct iwl_lib_ops iwl1000_lib = { 
			EEPROM_5000_REG_BAND_3_CHANNELS,

			EEPROM_5000_REG_BAND_4_CHANNELS,

			EEPROM_5000_REG_BAND_5_CHANNELS,

			EEPROM_5000_REG_BAND_24_FAT_CHANNELS,

			EEPROM_5000_REG_BAND_52_FAT_CHANNELS

			EEPROM_5000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_5000_REG_BAND_52_HT40_CHANNELS

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct iwl3945_eeprom { 
 * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory

 * txpower (MSB).

 *

 * Entries immediately below are for 20 MHz channel width.  FAT (40 MHz)

 * Entries immediately below are for 20 MHz channel width.  HT40 (40 MHz)

 * channels (only for 4965, not supported by 3945) appear later in the EEPROM.

 *

 * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14

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

+2 −2
Original line number Diff line number Diff line
@@ -2851,8 +2851,8 @@ static struct iwl_lib_ops iwl3945_lib = { 
			EEPROM_REGULATORY_BAND_3_CHANNELS,

			EEPROM_REGULATORY_BAND_4_CHANNELS,

			EEPROM_REGULATORY_BAND_5_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_FAT,

			EEPROM_REGULATORY_BAND_NO_FAT,

			EEPROM_REGULATORY_BAND_NO_HT40,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,

		.acquire_semaphore = iwl3945_eeprom_acquire_semaphore,

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) 
 *

 * 1)  Regulatory information (max txpower and channel usage flags) is provided

 *     separately for each channel that can possibly supported by 4965.

 *     40 MHz wide (.11n fat) channels are listed separately from 20 MHz

 *     40 MHz wide (.11n HT40) channels are listed separately from 20 MHz

 *     (legacy) channels.

 *

 *     See struct iwl4965_eeprom_channel for format, and struct iwl4965_eeprom
@@ -251,8 +251,8 @@ static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) 
 *     no reduction (such as with regulatory txpower limits) is required.

 *

 *     Saturation and Backoff values apply equally to 20 Mhz (legacy) channel

 *     widths and 40 Mhz (.11n fat) channel widths; there is no separate

 *     factory measurement for fat channels.

 *     widths and 40 Mhz (.11n HT40) channel widths; there is no separate

 *     factory measurement for ht40 channels.

 *

 *     The result of this step is the final target txpower.  The rest of

 *     the steps figure out the proper settings for the device to achieve

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

+21 −21
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static void iwl4965_init_alive_start(struct iwl_priv *priv) 
	queue_work(priv->workqueue, &priv->restart);

}



static bool is_fat_channel(__le32 rxon_flags)

static bool is_ht40_channel(__le32 rxon_flags)

{

	int chan_mod = le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK)

				    >> RXON_FLG_CHANNEL_MODE_POS;
@@ -806,7 +806,7 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL49_RTC_INST_SIZE;

	priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;

	priv->hw_params.fat_channel = BIT(IEEE80211_BAND_5GHZ);

	priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
@@ -1266,7 +1266,7 @@ static const struct gain_entry gain_table[2][108] = { 
};



static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,

				    u8 is_fat, u8 ctrl_chan_high,

				    u8 is_ht40, u8 ctrl_chan_high,

				    struct iwl4965_tx_power_db *tx_power_tbl)

{

	u8 saturation_power;
@@ -1298,8 +1298,8 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, 
	user_target_power = 2 * priv->tx_power_user_lmt;



	/* Get current (RXON) channel, band, width */

	IWL_DEBUG_TXPOWER(priv, "chan %d band %d is_fat %d\n", channel, band,

			  is_fat);

	IWL_DEBUG_TXPOWER(priv, "chan %d band %d is_ht40 %d\n", channel, band,

			  is_ht40);



	ch_info = iwl_get_channel_info(priv, priv->band, channel);
@@ -1318,7 +1318,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, 
	IWL_DEBUG_TXPOWER(priv, "channel %d belongs to txatten group %d\n",

			  channel, txatten_grp);



	if (is_fat) {

	if (is_ht40) {

		if (ctrl_chan_high)

			channel -= 2;

		else
@@ -1342,8 +1342,8 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, 


	/* regulatory txpower limits ... reg_limit values are in half-dBm,

	 *   max_power_avg values are in dBm, convert * 2 */

	if (is_fat)

		reg_limit = ch_info->fat_max_power_avg * 2;

	if (is_ht40)

		reg_limit = ch_info->ht40_max_power_avg * 2;

	else

		reg_limit = ch_info->max_power_avg * 2;
@@ -1509,7 +1509,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, 
/**

 * iwl4965_send_tx_power - Configure the TXPOWER level user limit

 *

 * Uses the active RXON for channel, band, and characteristics (fat, high)

 * Uses the active RXON for channel, band, and characteristics (ht40, high)

 * The power limit is taken from priv->tx_power_user_lmt.

 */

static int iwl4965_send_tx_power(struct iwl_priv *priv)
@@ -1517,7 +1517,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv) 
	struct iwl4965_txpowertable_cmd cmd = { 0 };

	int ret;

	u8 band = 0;

	bool is_fat = false;

	bool is_ht40 = false;

	u8 ctrl_chan_high = 0;



	if (test_bit(STATUS_SCANNING, &priv->status)) {
@@ -1530,9 +1530,9 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv) 


	band = priv->band == IEEE80211_BAND_2GHZ;



	is_fat =  is_fat_channel(priv->active_rxon.flags);

	is_ht40 =  is_ht40_channel(priv->active_rxon.flags);



	if (is_fat &&

	if (is_ht40 &&

	    (priv->active_rxon.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))

		ctrl_chan_high = 1;
@@ -1541,7 +1541,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv) 


	ret = iwl4965_fill_txpower_tbl(priv, band,

				le16_to_cpu(priv->active_rxon.channel),

				is_fat, ctrl_chan_high, &cmd.tx_power);

				is_ht40, ctrl_chan_high, &cmd.tx_power);

	if (ret)

		goto out;
@@ -1595,7 +1595,7 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel) 
{

	int rc;

	u8 band = 0;

	bool is_fat = false;

	bool is_ht40 = false;

	u8 ctrl_chan_high = 0;

	struct iwl4965_channel_switch_cmd cmd = { 0 };

	const struct iwl_channel_info *ch_info;
@@ -1604,9 +1604,9 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel) 


	ch_info = iwl_get_channel_info(priv, priv->band, channel);



	is_fat = is_fat_channel(priv->staging_rxon.flags);

	is_ht40 = is_ht40_channel(priv->staging_rxon.flags);



	if (is_fat &&

	if (is_ht40 &&

	    (priv->active_rxon.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))

		ctrl_chan_high = 1;
@@ -1621,7 +1621,7 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel) 
	else

		cmd.expect_beacon = 1;



	rc = iwl4965_fill_txpower_tbl(priv, band, channel, is_fat,

	rc = iwl4965_fill_txpower_tbl(priv, band, channel, is_ht40,

				      ctrl_chan_high, &cmd.tx_power);

	if (rc) {

		IWL_DEBUG_11H(priv, "error:%d  fill txpower_tbl\n", rc);
@@ -1688,8 +1688,8 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv) 
	u32 R4;



	if (test_bit(STATUS_TEMPERATURE, &priv->status) &&

		(priv->statistics.flag & STATISTICS_REPLY_FLG_FAT_MODE_MSK)) {

		IWL_DEBUG_TEMP(priv, "Running FAT temperature calibration\n");

		(priv->statistics.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {

		IWL_DEBUG_TEMP(priv, "Running HT40 temperature calibration\n");

		R1 = (s32)le32_to_cpu(priv->card_alive_init.therm_r1[1]);

		R2 = (s32)le32_to_cpu(priv->card_alive_init.therm_r2[1]);

		R3 = (s32)le32_to_cpu(priv->card_alive_init.therm_r3[1]);
@@ -2330,8 +2330,8 @@ static struct iwl_lib_ops iwl4965_lib = { 
			EEPROM_REGULATORY_BAND_3_CHANNELS,

			EEPROM_REGULATORY_BAND_4_CHANNELS,

			EEPROM_REGULATORY_BAND_5_CHANNELS,

			EEPROM_4965_REGULATORY_BAND_24_FAT_CHANNELS,

			EEPROM_4965_REGULATORY_BAND_52_FAT_CHANNELS

			EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,

			EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,