diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-04-15 19:01:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-16 16:00:00 -0400 |
commit | 5425e490471d521bae2fce16d22995803b41d90f (patch) | |
tree | 96d827e8c17d3d5469ec0da05208e2c5730f085d /drivers/net/wireless/iwlwifi/iwl-sta.c | |
parent | 49ea85961cf8b60b5387cc1c1bc06fe4b6a31ee4 (diff) |
iwlwifi: hw_setting cleanup
1. This patch renames hw_setting to hw_params
2. Align names of the structure and variables
3. set_hw_params is called from libs_ops
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-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 8765358c1a1..bc2e603efd2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -157,7 +157,7 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv, | |||
157 | if (keyconf->keylen == WEP_KEY_LEN_128) | 157 | if (keyconf->keylen == WEP_KEY_LEN_128) |
158 | key_flags |= STA_KEY_FLG_KEY_SIZE_MSK; | 158 | key_flags |= STA_KEY_FLG_KEY_SIZE_MSK; |
159 | 159 | ||
160 | if (sta_id == priv->hw_setting.bcast_sta_id) | 160 | if (sta_id == priv->hw_params.bcast_sta_id) |
161 | key_flags |= STA_KEY_MULTICAST_MSK; | 161 | key_flags |= STA_KEY_MULTICAST_MSK; |
162 | 162 | ||
163 | spin_lock_irqsave(&priv->sta_lock, flags); | 163 | spin_lock_irqsave(&priv->sta_lock, flags); |
@@ -198,7 +198,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, | |||
198 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | 198 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); |
199 | key_flags &= ~STA_KEY_FLG_INVALID; | 199 | key_flags &= ~STA_KEY_FLG_INVALID; |
200 | 200 | ||
201 | if (sta_id == priv->hw_setting.bcast_sta_id) | 201 | if (sta_id == priv->hw_params.bcast_sta_id) |
202 | key_flags |= STA_KEY_MULTICAST_MSK; | 202 | key_flags |= STA_KEY_MULTICAST_MSK; |
203 | 203 | ||
204 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 204 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |