diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2009-06-19 16:52:42 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:56 -0400 |
commit | 90e8e424d9c071f2db22100de81af6c8f7df34ee (patch) | |
tree | e56d3c3e73b8d2e84b900c764bfeb7fb8fa314ca /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 3354a0f6a3ced6957dfb9f689ad075cfa8fd272f (diff) |
iwlwifi: drop sw_crypto from hw_params.
Each HW supported by iwlwifi is capable of hardware crypto
so drop this flag from hw_params structure.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 63cba8c0ad4d..d9285615c679 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -171,7 +171,7 @@ int iwl_commit_rxon(struct iwl_priv *priv) | |||
171 | le16_to_cpu(priv->staging_rxon.channel), | 171 | le16_to_cpu(priv->staging_rxon.channel), |
172 | priv->staging_rxon.bssid_addr); | 172 | priv->staging_rxon.bssid_addr); |
173 | 173 | ||
174 | iwl_set_rxon_hwcrypto(priv, !priv->hw_params.sw_crypto); | 174 | iwl_set_rxon_hwcrypto(priv, !priv->cfg->mod_params->sw_crypto); |
175 | 175 | ||
176 | /* Apply the new configuration | 176 | /* Apply the new configuration |
177 | * RXON unassoc clears the station table in uCode, send it before | 177 | * RXON unassoc clears the station table in uCode, send it before |
@@ -2337,7 +2337,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
2337 | 2337 | ||
2338 | IWL_DEBUG_MAC80211(priv, "enter\n"); | 2338 | IWL_DEBUG_MAC80211(priv, "enter\n"); |
2339 | 2339 | ||
2340 | if (priv->hw_params.sw_crypto) { | 2340 | if (priv->cfg->mod_params->sw_crypto) { |
2341 | IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n"); | 2341 | IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n"); |
2342 | return -EOPNOTSUPP; | 2342 | return -EOPNOTSUPP; |
2343 | } | 2343 | } |