From 0ef3f3e54c4562c9f175c59cff80de85fb7288f4 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Tue, 19 Mar 2013 06:39:29 +0000
Subject: [PATCH] --- yaml --- r: 361802 b: refs/heads/master c:
 8ed781668dd49b608f1e67a22e3b445fd0c2cd6f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/net/flow_keys.h   | 1 +
 trunk/net/core/flow_dissector.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ccdda51637c8..55b0bc086fdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0ebcb80cbf2022db839186b52f8de4591883559
+refs/heads/master: 8ed781668dd49b608f1e67a22e3b445fd0c2cd6f
diff --git a/trunk/include/net/flow_keys.h b/trunk/include/net/flow_keys.h
index 80461c1ae9ef..bb8271d487b7 100644
--- a/trunk/include/net/flow_keys.h
+++ b/trunk/include/net/flow_keys.h
@@ -9,6 +9,7 @@ struct flow_keys {
 		__be32 ports;
 		__be16 port16[2];
 	};
+	u16 thoff;
 	u8 ip_proto;
 };
 
diff --git a/trunk/net/core/flow_dissector.c b/trunk/net/core/flow_dissector.c
index 9d4c7201400d..e187bf06d673 100644
--- a/trunk/net/core/flow_dissector.c
+++ b/trunk/net/core/flow_dissector.c
@@ -140,6 +140,8 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
 			flow->ports = *ports;
 	}
 
+	flow->thoff = (u16) nhoff;
+
 	return true;
 }
 EXPORT_SYMBOL(skb_flow_dissect);