summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-07 02:28:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-07 02:28:16 +0200
commit97a7729a5c2f01faa076f38a7ec010961b456823 (patch)
treed1aaecf81d1357b5920579347e6bb894b4bfe11c /net/ipv4/af_inet.c
parentserial: mxs-auart: set the FIFO size to DMA buffer size (diff)
parentLinux 3.12-rc4 (diff)
downloadlinux-97a7729a5c2f01faa076f38a7ec010961b456823.tar.xz
linux-97a7729a5c2f01faa076f38a7ec010961b456823.zip
Merge 3.12-rc4 into tty-next
We want the tty fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 7a1874b7b8fd..cfeb85cff4f0 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -263,10 +263,8 @@ void build_ehash_secret(void)
get_random_bytes(&rnd, sizeof(rnd));
} while (rnd == 0);
- if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0) {
+ if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0)
get_random_bytes(&ipv6_hash_secret, sizeof(ipv6_hash_secret));
- net_secret_init();
- }
}
EXPORT_SYMBOL(build_ehash_secret);