瀏覽代碼

ip6: Don't set transport header in IPv6 tunneling

We only need to reset network header here.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Tom Herbert 9 年之前
父節點
當前提交
4b4a0c9143
共有 1 個文件被更改,包括 0 次插入2 次删除
  1. 0 2
      net/ipv6/ip6_tunnel.c

+ 0 - 2
net/ipv6/ip6_tunnel.c

@@ -1114,8 +1114,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		dst_cache_set_ip6(&t->dst_cache, ndst, &fl6->saddr);
 		dst_cache_set_ip6(&t->dst_cache, ndst, &fl6->saddr);
 	skb_dst_set(skb, dst);
 	skb_dst_set(skb, dst);
 
 
-	skb->transport_header = skb->network_header;
-
 	if (encap_limit >= 0) {
 	if (encap_limit >= 0) {
 		init_tel_txopt(&opt, encap_limit);
 		init_tel_txopt(&opt, encap_limit);
 		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
 		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);