Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / net / ipv6 / xfrm6_output.c

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 8e4170f9a0dac0bb926fcc023f31f37ba225fcab..56364a5f676ad71830c9b4118088e29b6da30cc5 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -23,6 +23,8 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
        return ip6_find_1stfragopt(skb, prevhdr);
 }
 
+EXPORT_SYMBOL(xfrm6_find_1stfragopt);
+
 static int xfrm6_tunnel_check_size(struct sk_buff *skb)
 {
        int mtu, ret = 0;
@@ -80,7 +82,7 @@ static int xfrm6_output_one(struct sk_buff *skb)
 
                spin_unlock_bh(&x->lock);
 
-               skb->nh.raw = skb->data;
+               skb_reset_network_header(skb);
 
                if (!(skb->dst = dst_pop(dst))) {
                        err = -EHOSTUNREACH;