Merge remote branch 'wireless-next/master' into ath6kl-next

[cascardo/linux.git] / drivers / net / wireless / rtlwifi / wifi.h

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index f3c132b..cdaf142 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1488,7 +1488,7 @@ struct rtl_intf_ops {
 
 struct rtl_mod_params {
        /* default: 0 = using hardware encryption */
-       int sw_crypto;
+       bool sw_crypto;
 
        /* default: 0 = DBG_EMERG (0)*/
        int debug;
@@ -1544,6 +1544,7 @@ struct rtl_hal_cfg {
 struct rtl_locks {
        /* mutex */
        struct mutex conf_mutex;
+       struct mutex ps_mutex;
 
        /*spin lock */
        spinlock_t ips_lock;
@@ -1551,7 +1552,6 @@ struct rtl_locks {
        spinlock_t h2c_lock;
        spinlock_t rf_ps_lock;
        spinlock_t rf_lock;
-       spinlock_t lps_lock;
        spinlock_t waitq_lock;
 
        /*Dual mac*/
@@ -1576,7 +1576,8 @@ struct rtl_works {
        /* For SW LPS */
        struct delayed_work ps_work;
        struct delayed_work ps_rfon_wq;
-       struct tasklet_struct ips_leave_tasklet;
+
+       struct work_struct lps_leave_work;
 };
 
 struct rtl_debug {