瀏覽代碼

ipv6: Don't reset inner headers in ip6_tnl_xmit

Since iptunnel_handle_offloads() is called in all paths we can
probably drop the block in ip6_tnl_xmit that was checking for
skb->encapsulation and resetting the inner headers.

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

+ 0 - 5
net/ipv6/ip6_tunnel.c

@@ -1120,11 +1120,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
 		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
 	}
 	}
 
 
-	if (likely(!skb->encapsulation)) {
-		skb_reset_inner_headers(skb);
-		skb->encapsulation = 1;
-	}
-
 	/* Calculate max headroom for all the headers and adjust
 	/* Calculate max headroom for all the headers and adjust
 	 * needed_headroom if necessary.
 	 * needed_headroom if necessary.
 	 */
 	 */