redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Tom Herbert 2016-05-18 09:06:24 -07:00 committed by David S. Miller
parent b8921ca83e
commit 3ee93eaf2b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv6/ip6_tunnel.c
View File

@ -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);
}
if (likely(!skb->encapsulation)) {
skb_reset_inner_headers(skb);
skb->encapsulation = 1;
}
/* Calculate max headroom for all the headers and adjust
* needed_headroom if necessary.
*/