summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-shared.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 10:10:47 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 23:25:32 +0400
commitf39c95e8d7a152b409977687a999356f0e54bde6 (patch)
treec4863cd9a6449d7e61034ebf12b8417d40011fc4 /drivers/net/wireless/iwlwifi/iwl-shared.h
parent9ca06f0a3fbf57c672c7f2cdfc85747a0bbfaf28 (diff)
downloadlinux-f39c95e8d7a152b409977687a999356f0e54bde6.tar.xz
iwlagn: priv->sta_lock moves to iwl_shared
Since it is used by all the layers, it needs to move to iwl_shared. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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-shared.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-shared.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 33953199ffc6..71496bf05104 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -150,6 +150,8 @@ struct iwl_hw_params {
* @hw_params: see struct iwl_hw_params
* @workqueue: the workqueue used by all the layers of the driver
* @lock: protect general shared data
+ * @sta_lock: protects the station table.
+ * If lock and sta_lock are needed, lock must be acquired first.
* @mutex:
*/
struct iwl_shared {
@@ -166,6 +168,7 @@ struct iwl_shared {
struct workqueue_struct *workqueue;
spinlock_t lock;
+ spinlock_t sta_lock;
struct mutex mutex;
};