From 22c7e963b00025d656d3cf34d7fe0213acd9e996 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Sat, 21 Aug 2010 06:23:15 +0000
Subject: [PATCH] --- yaml --- r: 213901 b: refs/heads/master c:
 739a91ef0625e0e4a40b835f4f891313c47915df h: refs/heads/master i:   213899:
 6dd56ab81acd29ae41a816d758da01185b5e050d v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/pkt_cls.h | 1 +
 trunk/net/sched/cls_flow.c    | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 036427ee66ed..07af97ad58e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81ce790bd75d49a0d119f5d7b27405e1d9b1bd57
+refs/heads/master: 739a91ef0625e0e4a40b835f4f891313c47915df
diff --git a/trunk/include/linux/pkt_cls.h b/trunk/include/linux/pkt_cls.h
index 7f6ba8658abe..defbde203d07 100644
--- a/trunk/include/linux/pkt_cls.h
+++ b/trunk/include/linux/pkt_cls.h
@@ -332,6 +332,7 @@ enum {
 	FLOW_KEY_SKUID,
 	FLOW_KEY_SKGID,
 	FLOW_KEY_VLAN_TAG,
+	FLOW_KEY_RXHASH,
 	__FLOW_KEY_MAX,
 };
 
diff --git a/trunk/net/sched/cls_flow.c b/trunk/net/sched/cls_flow.c
index cd709f1294df..5b271a18bc3a 100644
--- a/trunk/net/sched/cls_flow.c
+++ b/trunk/net/sched/cls_flow.c
@@ -306,6 +306,11 @@ static u32 flow_get_vlan_tag(const struct sk_buff *skb)
 	return tag & VLAN_VID_MASK;
 }
 
+static u32 flow_get_rxhash(struct sk_buff *skb)
+{
+	return skb_get_rxhash(skb);
+}
+
 static u32 flow_key_get(struct sk_buff *skb, int key)
 {
 	switch (key) {
@@ -343,6 +348,8 @@ static u32 flow_key_get(struct sk_buff *skb, int key)
 		return flow_get_skgid(skb);
 	case FLOW_KEY_VLAN_TAG:
 		return flow_get_vlan_tag(skb);
+	case FLOW_KEY_RXHASH:
+		return flow_get_rxhash(skb);
 	default:
 		WARN_ON(1);
 		return 0;