From b821a7b58dabc89b96933857e98044d6ee816c52 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 20 Apr 2010 00:25:58 +0000
Subject: [PATCH] --- yaml --- r: 190229 b: refs/heads/master c:
 05d17608a69b3ae653ea5c9857283bef3439c733 h: refs/heads/master i:   190227:
 ae236351688255e662b60382133a965cb17b1562 v: v3

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

diff --git a/[refs] b/[refs]
index c6acdf501aa9..d024e004e150 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04997b13a2c2fc93af970fe95fd29a74db113e8
+refs/heads/master: 05d17608a69b3ae653ea5c9857283bef3439c733
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 92584bfef09b..f769098774b7 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1990,7 +1990,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
 				queue_index = skb_tx_hash(dev, skb);
 
 			if (sk) {
-				struct dst_entry *dst = rcu_dereference(sk->sk_dst_cache);
+				struct dst_entry *dst = rcu_dereference_bh(sk->sk_dst_cache);
 
 				if (dst && skb_dst(skb) == dst)
 					sk_tx_queue_set(sk, queue_index);