diff --git a/[refs] b/[refs] index afd656ae1139..5d3e3b103a87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a831f5bbc89a9978795504be9e1ff412043f8f77 +refs/heads/master: 8dd7368dd97def967bbb3aec67b882e8dfd1a528 diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h index db3b2ba0f4f8..1d6d3ccc9413 100644 --- a/trunk/include/linux/ipv6.h +++ b/trunk/include/linux/ipv6.h @@ -226,12 +226,12 @@ struct inet6_skb_parm { __u16 dst0; __u16 srcrt; __u16 dst1; -#ifdef CONFIG_IPV6_MIP6 - __u16 dsthao; -#endif __u16 lastopt; __u32 nhoff; __u16 flags; +#ifdef CONFIG_IPV6_MIP6 + __u16 dsthao; +#endif #define IP6SKB_XFRM_TRANSFORMED 1 };