diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
| commit | 0d8165e9fca119b804de2cf35674e07c36c9704f (patch) | |
| tree | 3d66d027b502b6fdb98666a9121c7f52b48c657d /include/linux/ieee80211.h | |
| parent | 4c9d546f6c522f541dfb01e192ab7101eca0053b (diff) | |
| parent | 076f0d20b636ef0e701e21e701c0631b5757b732 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'include/linux/ieee80211.h')
| -rw-r--r-- | include/linux/ieee80211.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 8def09e55f0c..a5b598a79bec 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2289,4 +2289,8 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim, 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 */ |