projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iommu-fixes-v3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
net
/
wireless
/
core.h
diff --git
a/net/wireless/core.h
b/net/wireless/core.h
index
e9afbf1
..
7e3a3ce
100644
(file)
--- 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