commit 077c5a0948cc7b75032288bd37bd6641ef05da76
author Tom Herbert <therbert@google.com> Mon Sep 29 20:22:31 2014 -0700
committer David S. Miller <davem@davemloft.net> Wed Oct 01 21:35:51 2014 -0400
tree 61b94a7b121715fca4d82a40779c6221e55fe132
parent 469471cdfc1902861fedafe8c5c1c8dbf5ad6ba6

ipip: Set inner IP protocol in ipip

Call skb_set_inner_ipproto to set inner IP protocol to IPPROTO_IPV4
before tunnel_xmit. This is needed if UDP encapsulation (fou) is
being done.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index bfec31d..ea88ab3 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -224,6 +224,8 @@
 	if (IS_ERR(skb))
 		goto out;
 
+	skb_set_inner_ipproto(skb, IPPROTO_IPIP);
+
 	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);
 	return NETDEV_TX_OK;