From 37c103a4f0e0aef0e40573cc5058e6a91c99b906 Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krkumar2@in.ibm.com>
Date: Wed, 18 Feb 2009 17:55:02 -0800
Subject: [PATCH] --- yaml --- r: 134631 b: refs/heads/master c:
 e88721f87d8caa679e62d6004a9a5661f1ac7b0e h: refs/heads/master i:   134629:
 e9c81515d5ecfeaebe06a44220726d768d41b577   134627:
 83fb2e40c6747233e669c9407febf8396c5af67f   134623:
 9616619dbebd36e2b1757005ec48fa83113dc2ec v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 66dde049008d..d5b081026aaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38bb045d493cc166920834087acd934dedc1b5d5
+refs/heads/master: e88721f87d8caa679e62d6004a9a5661f1ac7b0e
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index d393fc997cd9..5493394118fb 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1745,17 +1745,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 }
 
 static u32 skb_tx_hashrnd;
-static int skb_tx_hashrnd_initialized = 0;
 
 static u16 skb_tx_hash(struct net_device *dev, struct sk_buff *skb)
 {
 	u32 hash;
 
-	if (unlikely(!skb_tx_hashrnd_initialized)) {
-		get_random_bytes(&skb_tx_hashrnd, 4);
-		skb_tx_hashrnd_initialized = 1;
-	}
-
 	if (skb_rx_queue_recorded(skb)) {
 		hash = skb_get_rx_queue(skb);
 	} else if (skb->sk && skb->sk->sk_hash) {
@@ -5291,6 +5285,14 @@ static int __init net_dev_init(void)
 
 subsys_initcall(net_dev_init);
 
+static int __init initialize_hashrnd(void)
+{
+	get_random_bytes(&skb_tx_hashrnd, sizeof(skb_tx_hashrnd));
+	return 0;
+}
+
+late_initcall_sync(initialize_hashrnd);
+
 EXPORT_SYMBOL(__dev_get_by_index);
 EXPORT_SYMBOL(__dev_get_by_name);
 EXPORT_SYMBOL(__dev_remove_pack);