From 8479c23e5860fb7244d6d10d1529bf4534bf1bd8 Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Tue, 5 Aug 2008 01:19:50 -0700
Subject: [PATCH] --- yaml --- r: 107735 b: refs/heads/master c:
 95c3e8bfcdea8676e2d4d61910c379f4502049bf h: refs/heads/master i:   107733:
 b0f2338b60c8cee238e594fa582bbfcb2575b4cb   107731:
 b67824dae983f12005e3ca9d7c6d360acd88df69   107727:
 f8c53955eec9d8171134ffaf0601acc0f2d96582 v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/flow.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 722082a46a6c..ed09679bf666 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f751b67a8be698cec52f786910ef4f0beffe9a7
+refs/heads/master: 95c3e8bfcdea8676e2d4d61910c379f4502049bf
diff --git a/trunk/include/net/flow.h b/trunk/include/net/flow.h
index ad16e0076c89..228b2477ceec 100644
--- a/trunk/include/net/flow.h
+++ b/trunk/include/net/flow.h
@@ -47,7 +47,6 @@ struct flowi {
 #define fl4_scope	nl_u.ip4_u.scope
 
 	__u8	proto;
-	__u8	flags;
 	union {
 		struct {
 			__be16	sport;