Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / mvm / mvm.h

diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 16c5a6d7e0c9dee0909b55cb027f2f28c5e6a282..4bde2d027dcd34ce710722af8416e9c3a1159461 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -658,7 +658,7 @@ struct iwl_mvm {
        const struct iwl_fw_bcast_filter *bcast_filters;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
        struct {
-               u32 override; /* u32 for debugfs_create_bool */
+               bool override;
                struct iwl_bcast_filter_cmd cmd;
        } dbgfs_bcast_filtering;
 #endif
@@ -682,7 +682,7 @@ struct iwl_mvm {
        bool disable_power_off;
        bool disable_power_off_d3;
 
-       u32 scan_iter_notif_enabled; /* must be u32 for debugfs_create_bool */
+       bool scan_iter_notif_enabled;
 
        struct debugfs_blob_wrapper nvm_hw_blob;
        struct debugfs_blob_wrapper nvm_sw_blob;
@@ -739,7 +739,7 @@ struct iwl_mvm {
        int n_nd_channels;
        bool net_detect;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-       u32 d3_wake_sysassert; /* must be u32 for debugfs_create_bool */
+       bool d3_wake_sysassert;
        bool d3_test_active;
        bool store_d3_resume_sram;
        void *d3_resume_sram;
@@ -1036,7 +1036,7 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status);
 #else
 static inline const char *iwl_mvm_get_tx_fail_reason(u32 status) { return ""; }
 #endif
-int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, bool sync);
+int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, u32 flags);
 void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm);
 
 static inline void iwl_mvm_set_tx_cmd_ccmp(struct ieee80211_tx_info *info,