Commit b8ee15c9 authored by Ville Nuorvala's avatar Ville Nuorvala Committed by Linus Torvalds

[IPV6]: In ip6ip6 tunnel, set skb->h.raw after obtaining private copy.

parent c30750d5
...@@ -681,7 +681,6 @@ int ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -681,7 +681,6 @@ int ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev); icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev);
goto tx_err_dst_release; goto tx_err_dst_release;
} }
skb->h.raw = skb->nh.raw;
/* /*
* Okay, now see if we can stuff it in the buffer as-is. * Okay, now see if we can stuff it in the buffer as-is.
...@@ -703,6 +702,8 @@ int ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -703,6 +702,8 @@ int ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
dst_release(skb->dst); dst_release(skb->dst);
skb->dst = dst_clone(dst); skb->dst = dst_clone(dst);
skb->h.raw = skb->nh.raw;
if (opt) if (opt)
ipv6_push_nfrag_opts(skb, opt, &proto, NULL); ipv6_push_nfrag_opts(skb, opt, &proto, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment