summaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2014-09-29 20:22:30 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-01 21:35:51 -0400
commit469471cdfc1902861fedafe8c5c1c8dbf5ad6ba6 (patch)
tree9761489a0fde80ede3322a7b1e1e4ebfec8305fa /net/ipv6/sit.c
parent8bce6d7d0d1ede22af334ee241841e9278365278 (diff)
downloadop-kernel-dev-469471cdfc1902861fedafe8c5c1c8dbf5ad6ba6.zip
op-kernel-dev-469471cdfc1902861fedafe8c5c1c8dbf5ad6ba6.tar.gz
sit: Set inner IP protocol in sit
Call skb_set_inner_ipproto to set inner IP protocol to IPPROTO_IPV6 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>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index db75809..0d4e274 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -982,6 +982,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
goto tx_error;
}
+ skb_set_inner_ipproto(skb, IPPROTO_IPV6);
+
err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr,
protocol, tos, ttl, df,
!net_eq(tunnel->net, dev_net(dev)));
@@ -1006,6 +1008,8 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
if (IS_ERR(skb))
goto out;
+ skb_set_inner_ipproto(skb, IPPROTO_IPIP);
+
ip_tunnel_xmit(skb, dev, tiph, IPPROTO_IPIP);
return NETDEV_TX_OK;
out:
OpenPOWER on IntegriCloud