forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wireless: make TU conversion macros available

Browse source 
A few places in the code (mac80211 and iwlmvm) use the same
TU_TO_JIFFIES() macro and could use TU_TO_EXP_TIME() that
mac80211 has. Make these available to everyone and use them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-07-25 21:45:17 +02:00
commit e7f1935c11
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/wireless/iwlwifi/mvm/time-event.c
View file

@ -73,7 +73,6 @@
#include "iwl-prph.h" #include "iwl-prph.h"
/* A TimeUnit is 1024 microsecond */ /* A TimeUnit is 1024 microsecond */
#define TU_TO_JIFFIES(_tu) (usecs_to_jiffies((_tu) * 1024))
#define MSEC_TO_TU(_msec) (_msec*1000/1024) #define MSEC_TO_TU(_msec) (_msec*1000/1024)
/* /*
@ -191,8 +190,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
iwl_mvm_te_clear_data(mvm, te_data); iwl_mvm_te_clear_data(mvm, te_data);
} else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) { } else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
te_data->running = true; te_data->running = true;
te_data->end_jiffies = jiffies + te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
TU_TO_JIFFIES(te_data->duration);
if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) { if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status); set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);
@ -329,8 +327,7 @@ void iwl_mvm_protect_session(struct iwl_mvm *mvm,
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
if (te_data->running && if (te_data->running &&
time_after(te_data->end_jiffies, time_after(te_data->end_jiffies, TU_TO_EXP_TIME(min_duration))) {
jiffies + TU_TO_JIFFIES(min_duration))) {
IWL_DEBUG_TE(mvm, "We have enough time in the current TE: %u\n", IWL_DEBUG_TE(mvm, "We have enough time in the current TE: %u\n",
jiffies_to_msecs(te_data->end_jiffies - jiffies)); jiffies_to_msecs(te_data->end_jiffies - jiffies));
return; return;

4
include/linux/ieee80211.h
View file

@ -2288,4 +2288,8 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
return !!(tim->virtual_map[index] & mask); return !!(tim->virtual_map[index] & mask);
} }
/* convert time units */
#define TU_TO_JIFFIES(x) (usecs_to_jiffies((x) * 1024))
#define TU_TO_EXP_TIME(x) (jiffies + TU_TO_JIFFIES(x))
#endif /* LINUX_IEEE80211_H */ #endif /* LINUX_IEEE80211_H */

3
net/mac80211/ieee80211_i.h
View file

@ -53,9 +53,6 @@ struct ieee80211_local;
* increased memory use (about 2 kB of RAM per entry). */ * increased memory use (about 2 kB of RAM per entry). */
#define IEEE80211_FRAGMENT_MAX 4 #define IEEE80211_FRAGMENT_MAX 4
#define TU_TO_JIFFIES(x) (usecs_to_jiffies((x) * 1024))
#define TU_TO_EXP_TIME(x) (jiffies + TU_TO_JIFFIES(x))
/* power level hasn't been configured (or set to automatic) */ /* power level hasn't been configured (or set to automatic) */
#define IEEE80211_UNSET_POWER_LEVEL INT_MIN #define IEEE80211_UNSET_POWER_LEVEL INT_MIN