diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-27 13:35:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-27 13:35:56 -0400 |
| commit | f9fa39e9ace5a8abbe9597c2970828ced67261da (patch) | |
| tree | f6ee7662344c372626aeed7b4c9a8d8525fd0fbc /net/wireless/core.h | |
| parent | e940f5d6ba6a01f8dbb870854d5205d322452730 (diff) | |
| parent | e055a6e20a9105551295da164c31179b82c6227e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 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 e9afbf10e756..7e3a3cef7df9 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 |