diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-19 10:10:45 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-20 11:50:16 +0400 |
| commit | 49e8ab03ebcacd8e37660ffec20c0c46721a2800 (patch) | |
| tree | 78f17093ffdbf4e2cd788033f113888c472f0d7b /net/ipv4/af_inet.c | |
| parent | 4da79504b2b41410dd56e9268c9ad403aa65e89c (diff) | |
| download | linux-49e8ab03ebcacd8e37660ffec20c0c46721a2800.tar.xz | |
net: build_ehash_secret() and rt_bind_peer() cleanups
Now cmpxchg() is available on all arches, we can use it in
build_ehash_secret() and rt_bind_peer() instead of using spinlocks.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 6a1100c25a9f..f581f77d1097 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -227,18 +227,16 @@ EXPORT_SYMBOL(inet_ehash_secret); /* * inet_ehash_secret must be set exactly once - * Instead of using a dedicated spinlock, we (ab)use inetsw_lock */ void build_ehash_secret(void) { u32 rnd; + do { get_random_bytes(&rnd, sizeof(rnd)); } while (rnd == 0); - spin_lock_bh(&inetsw_lock); - if (!inet_ehash_secret) - inet_ehash_secret = rnd; - spin_unlock_bh(&inetsw_lock); + + cmpxchg(&inet_ehash_secret, 0, rnd); } EXPORT_SYMBOL(build_ehash_secret); |