fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / ip6_tunnel.h

diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 85805a7..af3f4a7 100644 (file)
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -16,6 +16,8 @@
 #define IP6_TNL_F_USE_ORIG_FLOWLABEL 0x4
 /* being used for Mobile IPv6 */
 #define IP6_TNL_F_MIP6_DEV 0x8
+/* copy DSCP from the outer packet */
+#define IP6_TNL_F_RCV_DSCP_COPY 0x10
 
 struct ip6_tnl_parm {
        char name[IFNAMSIZ];    /* name of tunnel device */
@@ -23,7 +25,7 @@ struct ip6_tnl_parm {
        __u8 proto;             /* tunnel protocol */
        __u8 encap_limit;       /* encapsulation limit for tunnel */
        __u8 hop_limit;         /* hop limit for tunnel */
-       __u32 flowinfo;         /* traffic class and flowlabel for tunnel */
+       __be32 flowinfo;        /* traffic class and flowlabel for tunnel */
        __u32 flags;            /* tunnel flags */
        struct in6_addr laddr;  /* local tunnel end-point address */
        struct in6_addr raddr;  /* remote tunnel end-point address */