---

yaml --- r: 361802 b: refs/heads/master c: 8ed7816 h: refs/heads/master v: v3
git-mirror · Mar 20, 2013 · 0ef3f3e · 0ef3f3e
1 parent 11ceb73
commit 0ef3f3e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);