diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-16 14:24:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-16 14:24:51 -0400 |
| commit | d0746663667f37e7be5646bf68cb452c8375a23d (patch) | |
| tree | 85ae5a3d5e5bae53815baba5dba372e4d53a9745 /include/linux | |
| parent | 41caa760d6acaf47cbd44c3d78307fb9be089111 (diff) | |
| parent | 27b3eb9c06a7193bdc9800cd00764a130343bc8a (diff) | |
| download | cachepc-linux-d0746663667f37e7be5646bf68cb452c8375a23d.tar.gz cachepc-linux-d0746663667f37e7be5646bf68cb452c8375a23d.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/linux')
| -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 b3ce299782af..23a8877f4ded 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2288,4 +2288,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 */ |