From: Pravin B Shelar Date: Fri, 8 Mar 2013 15:12:52 +0000 (+0000) Subject: ipip: capture inner headers during encapsulation X-Git-Tag: upstream/snapshot3+hdmi~5164^2~527 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f3ed9209f7f75ff0ee21bc5052d76542dd75b5f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ipip: capture inner headers during encapsulation Allow IPIP to make use of tx-checksum offloading. Signed-off-by: Pravin B Shelar Signed-off-by: David S. Miller --- diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 18f5352..b50435b 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -483,11 +483,6 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) if (skb->protocol != htons(ETH_P_IP)) goto tx_error; - - if (skb->ip_summed == CHECKSUM_PARTIAL && - skb_checksum_help(skb)) - goto tx_error; - old_iph = ip_hdr(skb); if (tos & 1) @@ -572,6 +567,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) old_iph = ip_hdr(skb); } + if (!skb->encapsulation) { + skb_reset_inner_headers(skb); + skb->encapsulation = 1; + } + if (skb->ip_summed != CHECKSUM_PARTIAL) + skb->ip_summed = CHECKSUM_NONE; + skb->transport_header = skb->network_header; skb_push(skb, sizeof(struct iphdr)); skb_reset_network_header(skb); @@ -599,7 +601,6 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) iph->ttl = old_iph->ttl; nf_reset(skb); - skb->ip_summed = CHECKSUM_NONE; pkt_len = skb->len - skb_transport_offset(skb); err = ip_local_out(skb);