diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-21 12:49:38 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-21 12:49:38 +0300 |
| commit | 0ccab3db2b3d045905e4336a407a370ae0342d49 (patch) | |
| tree | c9e9f6839419a850460e8eb74750c4ac28d142d1 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | 53446699892b7a171128295a85014732b9a1796b (diff) | |
| parent | 7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d (diff) | |
| download | op-kernel-dev-0ccab3db2b3d045905e4336a407a370ae0342d49.zip op-kernel-dev-0ccab3db2b3d045905e4336a407a370ae0342d49.tar.gz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 4a5db07..beca97a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -1033,7 +1033,7 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif) } /* Assoc status */ -bool iwl_mvm_is_associated(struct iwl_mvm *mvm); +bool iwl_mvm_is_idle(struct iwl_mvm *mvm); /* Thermal management and CT-kill */ void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff); |
