diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-11 15:52:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-11 15:52:57 -0400 |
| commit | 95d01a669bd35d0e8eb28dd8a946876c00a9a61a (patch) | |
| tree | e8169b32120729111321efc53cb4315d9c0e21e7 /net/wireless/core.h | |
| parent | 5e6438db34d522ee1c78b5d4c1c35a4a3bbd5054 (diff) | |
| parent | ca424b2022410b6c2cd0bc0f9a0438ed0b75f95f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index e9afbf10e75..7e3a3cef7df 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -424,7 +424,7 @@ static inline unsigned int elapsed_jiffies_msecs(unsigned long start) if (end >= start) return jiffies_to_msecs(end - start); - return jiffies_to_msecs(end + (MAX_JIFFY_OFFSET - start) + 1); + return jiffies_to_msecs(end + (ULONG_MAX - start) + 1); } void |