diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 14:24:31 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:11 -0500 |
commit | 54708d8df355b7ecf1d25d4049336840e6107d96 (patch) | |
tree | 1a22241a989dce504f2232b7b15a6b5e70d046ba /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
parent | a8bceb392a739321ec20d03a91a86ebdde9c07bb (diff) |
iwlwifi: remove SKU from config
There's no SKU override, we always just use
it from EEPROM. As such, we can remove it
from the config and use it in hw_param only.
Since iwl_eeprom_check_sku() really needs
to fill it in also rename that to
iwl_eeprom_init_hw_params().
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 2470ca767589..79ac7cb1701b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -235,7 +235,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control) | |||
235 | IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK | | 235 | IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK | |
236 | IWL_PAN_SCD_MULTICAST_MSK; | 236 | IWL_PAN_SCD_MULTICAST_MSK; |
237 | 237 | ||
238 | if (cfg(priv)->sku & EEPROM_SKU_CAP_11N_ENABLE) | 238 | if (hw_params(priv).sku & EEPROM_SKU_CAP_11N_ENABLE) |
239 | flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK; | 239 | flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK; |
240 | 240 | ||
241 | IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n", | 241 | IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n", |