aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-02-19 14:42:32 -0500
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 19:12:08 -0500
commit72e15d71b02a21fd7b94ee1af4ba3a41f722b1f3 (patch)
tree9e0435e3fba955ea598b637ac53fe8f0b879d22f /drivers/net/wireless/iwlwifi/iwl-dev.h
parent4967c31677cf3c6c49aadf205f1a31d15d7610da (diff)
iwlwifi: change WEP key protection to use mutex
For later station notification support we would like WEP key setting to be done synchronously always. Currently all places from which WEP key is set can sleep, but the usage of sta_lock prevents it to do so. Modify the locking to use priv->mutex instead and thus enable this call to sleep. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 90d2b6e0df76..bac8e7cc46ce 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1220,7 +1220,7 @@ struct iwl_priv {
1220 spinlock_t sta_lock; 1220 spinlock_t sta_lock;
1221 int num_stations; 1221 int num_stations;
1222 struct iwl_station_entry stations[IWL_STATION_COUNT]; 1222 struct iwl_station_entry stations[IWL_STATION_COUNT];
1223 struct iwl_wep_key wep_keys[WEP_KEYS_MAX]; 1223 struct iwl_wep_key wep_keys[WEP_KEYS_MAX]; /* protected by mutex */
1224 u8 default_wep_key; 1224 u8 default_wep_key;
1225 u8 key_mapping_key; 1225 u8 key_mapping_key;
1226 unsigned long ucode_key_table; 1226 unsigned long ucode_key_table;