diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-23 17:01:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-23 17:01:51 -0400 |
commit | 0cad43a7484179ec349e8e5792c558ee787a06ba (patch) | |
tree | 5e0931546c135c8802911ed2e5218c825b59ae2f /net/ipv4/inet_fragment.c | |
parent | df33db0f5efe8895203d221b9e701c0a61832c76 (diff) | |
parent | 7088ad74e6e710d0c80ea2cead9500f47a2a5d58 (diff) |
Merge branch 'frag_hash_secret'
Hannes Frederic Sowa says:
====================
initialize fragment hash secrets with net_get_random_once
This series switches the inet_frag.rnd hash initialization to
net_get_random_once.
Included patches:
ipv4: initialize ip4_frags hash secret as late
ipv6: split inet6_hash_frag for netfilter and
inet: remove old fragmentation hash initializing
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
-rw-r--r-- | net/ipv4/inet_fragment.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index c5313a9c019b..bb075fc9a14f 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -93,9 +93,6 @@ void inet_frags_init(struct inet_frags *f) | |||
93 | } | 93 | } |
94 | rwlock_init(&f->lock); | 94 | rwlock_init(&f->lock); |
95 | 95 | ||
96 | f->rnd = (u32) ((totalram_pages ^ (totalram_pages >> 7)) ^ | ||
97 | (jiffies ^ (jiffies >> 6))); | ||
98 | |||
99 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, | 96 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, |
100 | (unsigned long)f); | 97 | (unsigned long)f); |
101 | f->secret_timer.expires = jiffies + f->secret_interval; | 98 | f->secret_timer.expires = jiffies + f->secret_interval; |