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

[powerpc.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 93bbed5..9c8f4c9 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -191,6 +191,10 @@ struct inet6_skb_parm {
        __u16                   srcrt;
        __u16                   dst1;
        __u16                   lastopt;
+       __u32                   nhoff;
+       __u16                   flags;
+
+#define IP6SKB_XFRM_TRANSFORMED        1
 };
 
 #define IP6CB(skb)     ((struct inet6_skb_parm*)((skb)->cb))