Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...

[cascardo/linux.git] / include / uapi / linux / if_tunnel.h

diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index 777b6cd..92f3c86 100644 (file)
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -27,9 +27,23 @@
 #define GRE_SEQ                __cpu_to_be16(0x1000)
 #define GRE_STRICT     __cpu_to_be16(0x0800)
 #define GRE_REC                __cpu_to_be16(0x0700)
-#define GRE_FLAGS      __cpu_to_be16(0x00F8)
+#define GRE_ACK                __cpu_to_be16(0x0080)
+#define GRE_FLAGS      __cpu_to_be16(0x0078)
 #define GRE_VERSION    __cpu_to_be16(0x0007)
 
+#define GRE_IS_CSUM(f)         ((f) & GRE_CSUM)
+#define GRE_IS_ROUTING(f)      ((f) & GRE_ROUTING)
+#define GRE_IS_KEY(f)          ((f) & GRE_KEY)
+#define GRE_IS_SEQ(f)          ((f) & GRE_SEQ)
+#define GRE_IS_STRICT(f)       ((f) & GRE_STRICT)
+#define GRE_IS_REC(f)          ((f) & GRE_REC)
+#define GRE_IS_ACK(f)          ((f) & GRE_ACK)
+
+#define GRE_VERSION_0          __cpu_to_be16(0x0000)
+#define GRE_VERSION_1          __cpu_to_be16(0x0001)
+#define GRE_PROTO_PPP          __cpu_to_be16(0x880b)
+#define GRE_PPTP_KEY_MASK      __cpu_to_be32(0xffff)
+
 struct ip_tunnel_parm {
        char                    name[IFNAMSIZ];
        int                     link;
@@ -60,6 +74,7 @@ enum {
        IFLA_IPTUN_ENCAP_FLAGS,
        IFLA_IPTUN_ENCAP_SPORT,
        IFLA_IPTUN_ENCAP_DPORT,
+       IFLA_IPTUN_COLLECT_METADATA,
        __IFLA_IPTUN_MAX,
 };
 #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)