[SK_BUFF]: unions of just one member don't get anything done, kill them

[net-next-2.6.git] / net / ipv6 / xfrm6_mode_beet.c

diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index 8a01b0da2ddd80fe8ed801f69ff0b86976abdd18..2e61d6ddece303665ce8209f845c9f25195ce322 100644 (file)
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -48,8 +48,8 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
 
        skb_reset_network_header(skb);
        top_iph = ipv6_hdr(skb);
-       skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);
-       skb->nh.raw += offsetof(struct ipv6hdr, nexthdr);
+       skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);
+       skb->network_header += offsetof(struct ipv6hdr, nexthdr);
 
        ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
        ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);