From bac38be20ddc906c9bbb3e2a859452e55dfd44ca Mon Sep 17 00:00:00 2001
From: Willem de Bruijn <willemb@google.com>
Date: Fri, 26 Oct 2012 11:52:08 +0000
Subject: [PATCH] --- yaml --- r: 340543 b: refs/heads/master c:
 ecd5cf5dc5b07bc57aedf4c92453d6c343e3d840 h: refs/heads/master i:   340541:
 2b10aabadf19a37ede6f620e7da965189043237b   340539:
 42ac944f1b13fbf332d2bb822337eb83d7ef843d   340535:
 8aedd61b8620cd6f66a2b52d49fd9de2c09ccd7f   340527:
 618c5aa619eaeb9c245909d517b87b9a8a92280f   340511:
 5f3992f56d52f92d0047bd6c794da10daa11cf3c   340479:
 95482354bc39224f918430dc6275cf4b7bd3df58 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 26888a078c3b..1b457c2c98f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9add4d8174907c9977ad29cf6e71460829ec954e
+refs/heads/master: ecd5cf5dc5b07bc57aedf4c92453d6c343e3d840
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 6a2c34e6d962..a2a0bdb95a8f 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -643,7 +643,7 @@ extern unsigned int   skb_find_text(struct sk_buff *skb, unsigned int from,
 extern void __skb_get_rxhash(struct sk_buff *skb);
 static inline __u32 skb_get_rxhash(struct sk_buff *skb)
 {
-	if (!skb->rxhash)
+	if (!skb->l4_rxhash)
 		__skb_get_rxhash(skb);
 
 	return skb->rxhash;