diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-03-19 11:54:49 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-25 11:22:32 -0700 |
| commit | d28667f871991e0eea983b398421b8db2c8bdf8c (patch) | |
| tree | baeb7ca506966102456cfb3363a07bf377910173 /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | 6e8cc38d5b05bb812f89a35bd9bf52405e67d0df (diff) | |
| download | kernel_samsung_smdk4412-d28667f871991e0eea983b398421b8db2c8bdf8c.zip kernel_samsung_smdk4412-d28667f871991e0eea983b398421b8db2c8bdf8c.tar.gz kernel_samsung_smdk4412-d28667f871991e0eea983b398421b8db2c8bdf8c.tar.bz2 | |
iwlwifi: avoid device type checking in generic code
Avoid checking for specified device type to perform certain function,
switch to .cfg approach as more generic and better implementation
method.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 9e48352..1b4408a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -992,12 +992,12 @@ void iwl_set_rxon_chain(struct iwl_priv *priv) rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS; /* copied from 'iwl_bg_request_scan()' */ - /* Force use of chains B and C (0x6) for Rx for 4965 - * Avoid A (0x1) because of its off-channel reception on A-band. + /* Force use of chains B and C (0x6) for Rx + * Avoid A (0x1) for the device has off-channel reception on A-band. * MIMO is not used here, but value is required */ if (iwl_is_monitor_mode(priv) && !(priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) && - ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_4965)) { + priv->cfg->off_channel_workaround) { rx_chain = ANT_ABC << RXON_RX_CHAIN_VALID_POS; rx_chain |= ANT_BC << RXON_RX_CHAIN_FORCE_SEL_POS; rx_chain |= ANT_ABC << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS; |