aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/internal.h
diff options
context:
space:
mode:
authorLilach Edelstein <lilach.edelstein@intel.com>2013-01-16 04:34:49 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-01 05:27:22 -0500
commite56b04efc1f795da42cf1d9651b52a4a5bebd730 (patch)
treea9740ffd4d47ffb7b90507691a0a066c20f42a2d /drivers/net/wireless/iwlwifi/pcie/internal.h
parente139dc4aebf52a9c88552963b9794fd1dff036f1 (diff)
iwlwifi: move register access lock into transport
Move the reg_lock that protects HW register access into the transport implementation. Locking is no longer exposed, but handled internally in grab and release NIC access. This simplifies the users. Signed-off-by: Lilach Edelstein <lilach.edelstein@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/internal.h')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/internal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index 21395fae03c0..5f6bb4e09d42 100644
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -235,6 +235,7 @@ struct iwl_txq {
235 * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes) 235 * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes)
236 * @rx_page_order: page order for receive buffer size 236 * @rx_page_order: page order for receive buffer size
237 * @wd_timeout: queue watchdog timeout (jiffies) 237 * @wd_timeout: queue watchdog timeout (jiffies)
238 * @reg_lock: protect hw register access
238 */ 239 */
239struct iwl_trans_pcie { 240struct iwl_trans_pcie {
240 struct iwl_rxq rxq; 241 struct iwl_rxq rxq;
@@ -283,6 +284,9 @@ struct iwl_trans_pcie {
283 284
284 /* queue watchdog */ 285 /* queue watchdog */
285 unsigned long wd_timeout; 286 unsigned long wd_timeout;
287
288 /*protect hw register */
289 spinlock_t reg_lock;
286}; 290};
287 291
288/** 292/**