Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index af59fa5cc1f82560360833d02d60144e32662555..228b2477ceecde908e699c31d47efc247181bd3f 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -47,8 +47,6 @@ struct flowi {
 #define fl4_scope      nl_u.ip4_u.scope
 
        __u8    proto;
-       __u8    flags;
-#define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
        union {
                struct {
                        __be16  sport;