summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-05 20:24:25 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 21:16:09 +0100
commitfa23cb04b38a9950b21ee756e4419a737d496371 (patch)
treebd32f855439f23370e6e3fa4b712939004ab9d3a /drivers/net/wireless/iwlwifi/iwl-dev.h
parentiwlwifi: introduce per-queue locks (diff)
downloadlinux-fa23cb04b38a9950b21ee756e4419a737d496371.tar.xz
linux-fa23cb04b38a9950b21ee756e4419a737d496371.zip
iwlwifi: make sta lock private & BH lock
Now that the transport has its own locking, there's no need to have the sta_lock in the shared data. Also, it can be a BH lock as it's not used from IRQ handlers. 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-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 6e5bf0a14609..dc57522594a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -719,6 +719,12 @@ struct iwl_priv {
/*data shared among all the driver's layers */
struct iwl_shared *shrd;
+ /*
+ * protects the station table, if shrd->lock and sta_lock are
+ * needed, shrd->lock must be acquired first
+ */
+ spinlock_t sta_lock;
+
/* ieee device used by generic ieee processing code */
struct ieee80211_hw *hw;
struct ieee80211_channel *ieee_channels;