diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index d1f819238414733c1266b57b1596ce4780d75a4e..dc8d7ed637ef0d02d2b8f0c16c552e2694edac54 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1227,6 +1227,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 				t->err_time + IP6TUNNEL_ERR_TIMEO)) {
 			t->err_count--;
 
+			memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
 			dst_link_failure(skb);
 		} else {
 			t->err_count = 0;
@@ -1302,6 +1303,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 	return 0;
 tx_err_link_failure:
 	stats->tx_carrier_errors++;
+	memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
 	dst_link_failure(skb);
 tx_err_dst_release:
 	dst_release(dst);