projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
net
/
ipv4
/
inet_fragment.c
diff --git
a/net/ipv4/inet_fragment.c
b/net/ipv4/inet_fragment.c
index
4b86443
..
c5313a9
100644
(file)
--- a/
net/ipv4/inet_fragment.c
+++ b/
net/ipv4/inet_fragment.c
@@
-93,7
+93,7
@@
void inet_frags_init(struct inet_frags *f)
}
rwlock_init(&f->lock);
- f->rnd = (u32) ((
num_physpages ^ (num_physpages>>
7)) ^
+ f->rnd = (u32) ((
totalram_pages ^ (totalram_pages >>
7)) ^
(jiffies ^ (jiffies >> 6)));
setup_timer(&f->secret_timer, inet_frag_secret_rebuild,