Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index acd6a096250e65e149db68d18b22d8dd320b6b39..83969eebebf3b458bc4160fe0aded6f5d8fdd30c 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -34,7 +34,8 @@ struct flowi_common {
        __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC              0x01
 #define FLOWI_FLAG_KNOWN_NH            0x02
-#define FLOWI_FLAG_VRFSRC              0x04
+#define FLOWI_FLAG_L3MDEV_SRC          0x04
+#define FLOWI_FLAG_SKIP_NH_OIF         0x08
        __u32   flowic_secid;
        struct flowi_tunnel flowic_tun_key;
 };