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

Commit ed56a3f1 authored by Ben M Cahill's avatar Ben M Cahill Committed by John W. Linville
Browse files

iwlwifi: Add chain_noise support for 6050 



Existing iwl6050_ops->iwl6050_hcmd_utils structure had no pointers to chain
noise functions (gain_computation and chain_noise_reset).  As it turns out,
by adding chain_noise_scale (see related patch), there is no need for separate
chain noise function, so simply use iwl6000_ops->iwl5000_hcmd_utils, and
remove those for 6050.

Signed-off-by: default avatarBen Cahill <ben.m.cahill@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d4fe5ac9

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

+2 −17
Original line number Diff line number Diff line
@@ -277,21 +277,6 @@ static const struct iwl_ops iwl6000_ops = { 
	.led = &iwlagn_led_ops,

};



static struct iwl_hcmd_utils_ops iwl6050_hcmd_utils = {

	.get_hcmd_size = iwl5000_get_hcmd_size,

	.build_addsta_hcmd = iwl5000_build_addsta_hcmd,

	.rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag,

	.calc_rssi = iwl5000_calc_rssi,

};



static const struct iwl_ops iwl6050_ops = {

	.ucode = &iwl5000_ucode,

	.lib = &iwl6000_lib,

	.hcmd = &iwl5000_hcmd,

	.utils = &iwl6050_hcmd_utils,

	.led = &iwlagn_led_ops,

};



/*

 * "i": Internal configuration, use internal Power Amplifier

 */
@@ -395,7 +380,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6050_ops,

	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -427,7 +412,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl6050_ops,

	.ops = &iwl6000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,