iwlwifi driver updates 01/29/2009
cover iwlwifi driver updates 01/29/2009
This series contains updates to iwlwifi for support of new hardware.
We also include one Kconfig patch for ipw2x00 to fix a display problem.
[PATCH 1/7] iwlwifi: add new HW_REV_TYPEs for Intel WiFi Link 100, 6000 and 6050 Series [PATCH 2/7] iwlwifi: simplify parameter setting to allow support for 6000 series [PATCH 3/7] iwlwifi: parametrize configuration of the PLL for exclusion on 6000 [PATCH 4/7] iwlwifi: correct API command overlap
[PATCH 5/7] iwlwifi: define structures and functions externally for customization [PATCH 6/7] iwlwifi: remove chain noise calibration functions from 6000 family [PATCH 7/7] ipw2x00: correct Kconfig to prevent following entries from not indenting
Thank you
Reinette
PATCH 1/7 iwlwifi: add new HW_REV_TYPEs for Intel WiFi Link 100, 6000 and 6050 Series
From: Jay Sternberg <[email protected]>
simply add definitions for the HW_REV_TYPEs for the new devices.
--- drivers/net/wireless/iwlwifi/iwl-csr.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/wireless/iwlwifi/iwl-csr.h +3 -0
@@ -211,6 +211,9 @@#define CSR_HW_REV_TYPE_5350 (0x0000030)#define CSR_HW_REV_TYPE_5100 (0x0000050)#define CSR_HW_REV_TYPE_5150 (0x0000040) +#define CSR_HW_REV_TYPE_100 (0x0000060) +#define CSR_HW_REV_TYPE_6x00 (0x0000070) +#define CSR_HW_REV_TYPE_6x50 (0x0000080)#define CSR_HW_REV_TYPE_NONE (0x00000F0)/* EEPROM REG */
Signature · 1 line
1.5.4.3
PATCH 2/7 iwlwifi: simplify parameter setting to allow support for 6000 series
From: Jay Sternberg <[email protected]>
by parametrizing the set hw function, in addition to allowing for supporting the 6000 family significantly simplify the addition of new hardware.
--- drivers/net/wireless/iwlwifi/iwl-100.c | 2 + drivers/net/wireless/iwlwifi/iwl-5000.c | 76 ++++++++++++++++--------------- drivers/net/wireless/iwlwifi/iwl-6000.c | 10 ++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 + 4 files changed, 53 insertions(+), 37 deletions(-)
drivers/net/wireless/iwlwifi/iwl-100.c +2 -0
@@ -66,5 +66,7 @@ struct iwl_cfg iwl100_bgn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_A, + .valid_rx_ant = ANT_AB, };
drivers/net/wireless/iwlwifi/iwl-5000.c +39 -37
150 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-6000.c +10 -0
@@ -72,6 +72,8 @@ struct iwl_cfg iwl6000_2ag_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_2agn_cfg = {
@@ -85,6 +87,8 @@ struct iwl_cfg iwl6000_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6050_2agn_cfg = {
@@ -98,6 +102,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_3agn_cfg = {
@@ -111,6 +117,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };struct iwl_cfg iwl6050_3agn_cfg = {
@@ -124,6 +132,8 @@ struct iwl_cfg iwl6050_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };MODULE_FIRMWARE (IWL6000_MODULE_FIRMWARE (IWL6000_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-core.h +2 -0
@@ -211,6 +211,8 @@ struct iwl_cfg {u16 eeprom_calib_ver;const struct iwl_ops *ops;const struct iwl_mod_params *mod_params; +u8 valid_tx_ant; +u8 valid_rx_ant; };/***************************
Signature · 1 line
1.5.4.3
PATCH 3/7 iwlwifi: parametrize configuration of the PLL for exclusion on 6000
From: Jay Sternberg <[email protected]>
added a config parameter to enable setting PLL_CFG. older hardware has this parameter set true. the 6000 family does not support this setting, so this parameter set false.
--- drivers/net/wireless/iwlwifi/iwl-100.c | 1 + drivers/net/wireless/iwlwifi/iwl-5000.c | 12 ++++++++++-- drivers/net/wireless/iwlwifi/iwl-6000.c | 5 +++++ drivers/net/wireless/iwlwifi/iwl-core.h | 1 + 4 files changed, 17 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/iwl-100.c +1 -0
@@ -68,5 +68,6 @@ struct iwl_cfg iwl100_bgn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_A, .valid_rx_ant = ANT_AB, + .need_pll_cfg = true, };
drivers/net/wireless/iwlwifi/iwl-5000.c +10 -2
@@ -109,7 +109,8 @@ static int iwl5000_apm_init(struct iwl_priv *priv)iwl_set_bit (priv,CSR_HW_IF_CONFIG_REG ,CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A ); -iwl_set_bit (priv,CSR_ANA_PLL_CFG ,CSR50_ANA_PLL_CFG_VAL ); +if (priv->cfg->need_pll_cfg) +iwl_set_bit (priv,CSR_ANA_PLL_CFG ,CSR50_ANA_PLL_CFG_VAL );/* set "initialization complete" bit to move adapter * D0U* --> D0A* state */
@@ -177,7 +178,8 @@ static int iwl5000_apm_reset(struct iwl_priv *priv)/* FIXME: put here L1A -L0S w/a */ -iwl_set_bit (priv,CSR_ANA_PLL_CFG ,CSR50_ANA_PLL_CFG_VAL ); +if (priv->cfg->need_pll_cfg) +iwl_set_bit (priv,CSR_ANA_PLL_CFG ,CSR50_ANA_PLL_CFG_VAL );/* set "initialization complete" bit to move adapter * D0U* --> D0A* state */
@@ -1548,6 +1550,7 @@ struct iwl_cfg iwl5300_agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC, + .need_pll_cfg = true, };struct iwl_cfg iwl5100_bg_cfg = {
@@ -1563,6 +1566,7 @@ struct iwl_cfg iwl5100_bg_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_A, .valid_rx_ant = ANT_AB, + .need_pll_cfg = true, };struct iwl_cfg iwl5100_abg_cfg = {
@@ -1578,6 +1582,7 @@ struct iwl_cfg iwl5100_abg_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_B, .valid_rx_ant = ANT_AB, + .need_pll_cfg = true, };struct iwl_cfg iwl5100_agn_cfg = {
@@ -1593,6 +1598,7 @@ struct iwl_cfg iwl5100_agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_B, .valid_rx_ant = ANT_AB, + .need_pll_cfg = true, };struct iwl_cfg iwl5350_agn_cfg = {
@@ -1608,6 +1614,7 @@ struct iwl_cfg iwl5350_agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC, + .need_pll_cfg = true, };struct iwl_cfg iwl5150_agn_cfg = {
@@ -1623,6 +1630,7 @@ struct iwl_cfg iwl5150_agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_B, .valid_rx_ant = ANT_AB, + .need_pll_cfg = true, };MODULE_FIRMWARE (IWL5000_MODULE_FIRMWARE (IWL5000_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-6000.c +5 -0
@@ -74,6 +74,7 @@ struct iwl_cfg iwl6000_2ag_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_BC, .valid_rx_ant = ANT_BC, + .need_pll_cfg = false, };struct iwl_cfg iwl6000_2agn_cfg = {
@@ -89,6 +90,7 @@ struct iwl_cfg iwl6000_2agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_BC, .valid_rx_ant = ANT_BC, + .need_pll_cfg = false, };struct iwl_cfg iwl6050_2agn_cfg = {
@@ -104,6 +106,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_BC, .valid_rx_ant = ANT_BC, + .need_pll_cfg = false, };struct iwl_cfg iwl6000_3agn_cfg = {
@@ -119,6 +122,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC, + .need_pll_cfg = false, };struct iwl_cfg iwl6050_3agn_cfg = {
@@ -134,6 +138,7 @@ struct iwl_cfg iwl6050_3agn_cfg = { .mod_params = &iwl50_mod_params, .valid_tx_ant = ANT_ABC, .valid_rx_ant = ANT_ABC, + .need_pll_cfg = false, };MODULE_FIRMWARE (IWL6000_MODULE_FIRMWARE (IWL6000_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-core.h +1 -0
@@ -213,6 +213,7 @@ struct iwl_cfg {const struct iwl_mod_params *mod_params;u8 valid_tx_ant;u8 valid_rx_ant; +bool need_pll_cfg; };/***************************
Signature · 1 line
1.5.4.3
PATCH 4/7 iwlwifi: correct API command overlap
From: Jay Sternberg <[email protected]>
Correct the API commands where same command id used for two different commands. Update max api versions for affected devices.
TX_ANT_CONFIGURATION_CMD was already using id 0x98, so REPLY_TX_POWER_DBM_CMD moved to 0x95
Older API interfaces may used original value so V1 defines provided.
--- drivers/net/wireless/iwlwifi/iwl-100.c | 2 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 9 ++++++++- drivers/net/wireless/iwlwifi/iwl-6000.c | 4 ++-- drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/iwlwifi/iwl-100.c +1 -1
@@ -46,7 +46,7 @@#include "iwl-5000-hw.h" /* Highest firmware API version supported */ -#define IWL100_UCODE_API_MAX 1 +#define IWL100_UCODE_API_MAX 2/* Lowest firmware API version supported */ #define IWL100_UCODE_API_MIN 1
drivers/net/wireless/iwlwifi/iwl-5000.c +8 -1
@@ -1411,12 +1411,19 @@ static int iwl5000_send_rxon_assoc(struct iwl_priv *priv)static int iwl5000_send_tx_power (struct iwl_priv *priv) {struct iwl5000_tx_power_dbm_cmd tx_power_cmd; +u8 tx_ant_cfg_cmd;/* half dBm need to multiply */ tx_power_cmd.global_lmt = (s8)(2 * priv->tx_power_user_lmt); tx_power_cmd.flags =IWL50_TX_POWER_NO_CLOSED ; tx_power_cmd.srv_chan_lmt =IWL50_TX_POWER_AUTO ; -return iwl_send_cmd_pdu_async (priv,REPLY_TX_POWER_DBM_CMD , + +if (IWL_UCODE_API (priv->ucode_ver) ==1 ) + tx_ant_cfg_cmd =REPLY_TX_POWER_DBM_CMD_V1 ; +else + tx_ant_cfg_cmd =REPLY_TX_POWER_DBM_CMD ; + +return iwl_send_cmd_pdu_async (priv, tx_ant_cfg_cmd,sizeof (tx_power_cmd), &tx_power_cmd,NULL ); }
drivers/net/wireless/iwlwifi/iwl-6000.c +2 -2
@@ -46,8 +46,8 @@#include "iwl-5000-hw.h" /* Highest firmware API version supported */ -#define IWL6000_UCODE_API_MAX 1 -#define IWL6050_UCODE_API_MAX 1 +#define IWL6000_UCODE_API_MAX 2 +#define IWL6050_UCODE_API_MAX 2/* Lowest firmware API version supported */ #define IWL6000_UCODE_API_MIN 1
drivers/net/wireless/iwlwifi/iwl-commands.h +3 -1
@@ -144,9 +144,11 @@ enum {WHO_IS_AWAKE_NOTIFICATION =0x94 ,/* not used */ /* Miscellaneous commands */ +REPLY_TX_POWER_DBM_CMD =0x95 ,QUIET_NOTIFICATION =0x96 ,/* not used */ REPLY_TX_PWR_TABLE_CMD =0x97 , -REPLY_TX_POWER_DBM_CMD =0x98 , +REPLY_TX_POWER_DBM_CMD_V1 =0x98 ,/* old version of API */ +TX_ANT_CONFIGURATION_CMD =0x98 ,/* not used */ MEASURE_ABORT_NOTIFICATION =0x99 ,/* not used */ /* Bluetooth device coexistence config command */
Signature · 1 line
1.5.4.3
PATCH 5/7 iwlwifi: define structures and functions externally for customization
From: Jay Sternberg <[email protected]>
defined the structures and functions as extern to alter behavior used by 5000 series for other products including 100 and 6000 series
--- drivers/net/wireless/iwlwifi/iwl-5000.c | 14 +++++++------- drivers/net/wireless/iwlwifi/iwl-dev.h | 12 ++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-)
drivers/net/wireless/iwlwifi/iwl-5000.c +7 -7
@@ -394,7 +394,7 @@ static void iwl5000_chain_noise_reset(struct iwl_priv *priv) } } -static void iwl5000_rts_tx_cmd_flag (struct ieee80211_tx_info *info, +void iwl5000_rts_tx_cmd_flag (struct ieee80211_tx_info *info,__le32 *tx_flags) { if ((info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) ||
@@ -1105,7 +1105,7 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,return 0 ; } -static u16 iwl5000_build_addsta_hcmd (const struct iwl_addsta_cmd *cmd,u8 *data) +u16 iwl5000_build_addsta_hcmd (const struct iwl_addsta_cmd *cmd,u8 *data) {u16 size = (u16 )sizeof (struct iwl_addsta_cmd );memcpy (data, cmd, size);
@@ -1334,7 +1334,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, }/* Currently 5000 is the superset of everything */ -static u16 iwl5000_get_hcmd_size (u8 cmd_id,u16 len) +u16 iwl5000_get_hcmd_size (u8 cmd_id,u16 len) {return len; }
@@ -1435,7 +1435,7 @@ static void iwl5000_temperature(struct iwl_priv *priv) }/* Calc max signal level (dBm) among 3 possible receivers */ -static int iwl5000_calc_rssi (struct iwl_priv *priv, +int iwl5000_calc_rssi (struct iwl_priv *priv,struct iwl_rx_phy_res *rx_resp) {/* data from PHY/DSP regarding signal strength, etc.,
@@ -1472,11 +1472,11 @@ static int iwl5000_calc_rssi(struct iwl_priv *priv,return max_rssi - agc -IWL49_RSSI_OFFSET ; } -static struct iwl_hcmd_ops iwl5000_hcmd = { +struct iwl_hcmd_ops iwl5000_hcmd = { .rxon_assoc = iwl5000_send_rxon_assoc, }; -static struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = { +struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = { .get_hcmd_size = iwl5000_get_hcmd_size, .build_addsta_hcmd = iwl5000_build_addsta_hcmd, .gain_computation = iwl5000_gain_computation,
@@ -1485,7 +1485,7 @@ static struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = { .calc_rssi = iwl5000_calc_rssi, }; -static struct iwl_lib_ops iwl5000_lib = { +struct iwl_lib_ops iwl5000_lib = { .set_hw_params = iwl5000_hw_set_hw_params, .txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl, .txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl,
drivers/net/wireless/iwlwifi/iwl-dev.h +12 -0
@@ -67,6 +67,18 @@ extern struct iwl_cfg iwl100_bgn_cfg;/* shared structures from iwl-5000.c */ extern struct iwl_mod_params iwl50_mod_params;extern struct iwl_ops iwl5000_ops; +extern struct iwl_lib_ops iwl5000_lib; +extern struct iwl_hcmd_ops iwl5000_hcmd; +extern struct iwl_hcmd_utils_ops iwl5000_hcmd_utils; + +/* shared functions from iwl-5000.c */ +extern u16 iwl5000_get_hcmd_size (u8 cmd_id,u16 len); +extern u16 iwl5000_build_addsta_hcmd (const struct iwl_addsta_cmd *cmd, +u8 *data); +extern void iwl5000_rts_tx_cmd_flag (struct ieee80211_tx_info *info, +__le32 *tx_flags); +extern int iwl5000_calc_rssi (struct iwl_priv *priv, +struct iwl_rx_phy_res *rx_resp);/* CT-KILL constants */ #define CT_KILL_THRESHOLD 110/* in Celsius */
Signature · 1 line
1.5.4.3
PATCH 6/7 iwlwifi: remove chain noise calibration functions from 6000 family
From: Jay Sternberg <[email protected]>
redefine structures that contain function pointer for chain noise reset and chain noise gain for the 6000 family since these are not needed.
--- drivers/net/wireless/iwlwifi/iwl-6000.c | 23 ++++++++++++++++++----- drivers/net/wireless/iwlwifi/iwl-calib.c | 5 +++-- 2 files changed, 21 insertions(+), 7 deletions(-)
drivers/net/wireless/iwlwifi/iwl-6000.c +18 -5
@@ -61,13 +61,26 @@#define _IWL6050_MODULE_FIRMWARE (api) IWL6050_FW_PRE #api ".ucode"#define IWL6050_MODULE_FIRMWARE (api) _IWL6050_MODULE_FIRMWARE(api) +static struct iwl_hcmd_utils_ops iwl6000_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 struct iwl_ops iwl6000_ops = { + .lib = &iwl5000_lib, + .hcmd = &iwl5000_hcmd, + .utils = &iwl6000_hcmd_utils, +}; +struct iwl_cfg iwl6000_2ag_cfg = { .name ="6000 Series 2x2 AG" , .fw_name_pre =IWL6000_FW_PRE , .ucode_api_max =IWL6000_UCODE_API_MAX , .ucode_api_min =IWL6000_UCODE_API_MIN , .sku =IWL_SKU_A |IWL_SKU_G , - .ops = &iwl5000_ops, + .ops = &iwl6000_ops, .eeprom_size =IWL_5000_EEPROM_IMG_SIZE , .eeprom_ver =EEPROM_5000_EEPROM_VERSION , .eeprom_calib_ver =EEPROM_5000_TX_POWER_VERSION ,
@@ -83,7 +96,7 @@ struct iwl_cfg iwl6000_2agn_cfg = { .ucode_api_max = IWL6000_UCODE_API_MAX, .ucode_api_min = IWL6000_UCODE_API_MIN, .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, - .ops = &iwl5000_ops, + .ops = &iwl6000_ops, .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -99,7 +112,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 = &iwl5000_ops, + .ops = &iwl6000_ops, .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -115,7 +128,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { .ucode_api_max = IWL6000_UCODE_API_MAX, .ucode_api_min = IWL6000_UCODE_API_MIN, .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, - .ops = &iwl5000_ops, + .ops = &iwl6000_ops, .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
@@ -131,7 +144,7 @@ struct iwl_cfg iwl6050_3agn_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 = &iwl5000_ops, + .ops = &iwl6000_ops, .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
drivers/net/wireless/iwlwifi/iwl-calib.c +3 -2
@@ -846,8 +846,9 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,IWL_DEBUG_CALIB (priv,"min_average_noise = %d, antenna %d\n" , min_average_noise, min_average_noise_antenna_i); - priv->cfg->ops->utils->gain_computation (priv, average_noise, - min_average_noise_antenna_i, min_average_noise); +if (priv->cfg->ops->utils->gain_computation) + priv->cfg->ops->utils->gain_computation (priv, average_noise, + min_average_noise_antenna_i, min_average_noise);/* Some power changes may have been made during the calibration. * Update and commit the RXON
Signature · 1 line
1.5.4.3
PATCH 7/7 ipw2x00: correct Kconfig to prevent following entries from not indenting
From: Jay Sternberg <[email protected]>
not defining dependencies for LIBIPW caused the following entries to not be indented. changing this entry to depend on PCI && WLAN_80211 corrects this issue
--- drivers/net/wireless/ipw2x00/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/wireless/ipw2x00/Kconfig +1 -0
@@ -150,6 +150,7 @@ config IPW2200_DEBUG config LIBIPW tristate + depends on PCI && WLAN_80211 select WIRELESS_EXT select CRYPTO select CRYPTO_ARC4
Signature · 1 line
1.5.4.3
PATCH v2 2/7 iwlwifi: simplify parameter setting to allow support for 6000 series
In reply to Reinette ChatreFrom: Jay Sternberg <[email protected]>
by parametrizing the set hw function, in addition to allowing for supporting the 6000 family significantly simplify the addition of new hardware.
---
v2 fix HW params initialization: antennas are antennas and chains are num_of_ant()
drivers/net/wireless/iwlwifi/iwl-100.c | 2 + drivers/net/wireless/iwlwifi/iwl-5000.c | 76 ++++++++++++++++--------------- drivers/net/wireless/iwlwifi/iwl-6000.c | 10 ++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 + 4 files changed, 53 insertions(+), 37 deletions(-)
drivers/net/wireless/iwlwifi/iwl-100.c +2 -0
@@ -66,5 +66,7 @@ struct iwl_cfg iwl100_bgn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_A, + .valid_rx_ant = ANT_AB, };
drivers/net/wireless/iwlwifi/iwl-5000.c +39 -37
150 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-6000.c +10 -0
@@ -72,6 +72,8 @@ struct iwl_cfg iwl6000_2ag_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_2agn_cfg = {
@@ -85,6 +87,8 @@ struct iwl_cfg iwl6000_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6050_2agn_cfg = {
@@ -98,6 +102,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_3agn_cfg = {
@@ -111,6 +117,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };struct iwl_cfg iwl6050_3agn_cfg = {
@@ -124,6 +132,8 @@ struct iwl_cfg iwl6050_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };MODULE_FIRMWARE (IWL6000_MODULE_FIRMWARE (IWL6000_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-core.h +2 -0
@@ -211,6 +211,8 @@ struct iwl_cfg {u16 eeprom_calib_ver;const struct iwl_ops *ops;const struct iwl_mod_params *mod_params; +u8 valid_tx_ant; +u8 valid_rx_ant; };/***************************
Signature · 1 line
1.5.4.3
PATCH v3 2/7 iwlwifi: simplify parameter setting to allow support for 6000 series
From: Jay Sternberg <[email protected]>
by parametrizing the set hw function, in addition to allowing for supporting the 6000 family significantly simplify the addition of new hardware.
---
v2 fix HW params initialization: antennas are antennas and chains are num_of_ant() v3 fix TX antenna initialization of 5100 and 5150
drivers/net/wireless/iwlwifi/iwl-100.c | 2 + drivers/net/wireless/iwlwifi/iwl-5000.c | 76 ++++++++++++++++--------------- drivers/net/wireless/iwlwifi/iwl-6000.c | 10 ++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 + 4 files changed, 53 insertions(+), 37 deletions(-)
drivers/net/wireless/iwlwifi/iwl-100.c +2 -0
@@ -66,5 +66,7 @@ struct iwl_cfg iwl100_bgn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_A, + .valid_rx_ant = ANT_AB, };
drivers/net/wireless/iwlwifi/iwl-5000.c +39 -37
150 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-6000.c +10 -0
@@ -72,6 +72,8 @@ struct iwl_cfg iwl6000_2ag_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_2agn_cfg = {
@@ -85,6 +87,8 @@ struct iwl_cfg iwl6000_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6050_2agn_cfg = {
@@ -98,6 +102,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_BC, + .valid_rx_ant = ANT_BC, };struct iwl_cfg iwl6000_3agn_cfg = {
@@ -111,6 +117,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };struct iwl_cfg iwl6050_3agn_cfg = {
@@ -124,6 +132,8 @@ struct iwl_cfg iwl6050_3agn_cfg = { .eeprom_ver = EEPROM_5000_EEPROM_VERSION, .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, .mod_params = &iwl50_mod_params, + .valid_tx_ant = ANT_ABC, + .valid_rx_ant = ANT_ABC, };MODULE_FIRMWARE (IWL6000_MODULE_FIRMWARE (IWL6000_UCODE_API_MAX ));
drivers/net/wireless/iwlwifi/iwl-core.h +2 -0
@@ -211,6 +211,8 @@ struct iwl_cfg {u16 eeprom_calib_ver;const struct iwl_ops *ops;const struct iwl_mod_params *mod_params; +u8 valid_tx_ant; +u8 valid_rx_ant; };/***************************
Signature · 1 line
1.5.4.3