diff options
| author | Tom Herbert <therbert@google.com> | 2014-09-29 20:22:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-01 21:35:51 -0400 |
| commit | 077c5a0948cc7b75032288bd37bd6641ef05da76 (patch) | |
| tree | 61b94a7b121715fca4d82a40779c6221e55fe132 /net | |
| parent | 469471cdfc1902861fedafe8c5c1c8dbf5ad6ba6 (diff) | |
| download | op-kernel-dev-077c5a0948cc7b75032288bd37bd6641ef05da76.zip op-kernel-dev-077c5a0948cc7b75032288bd37bd6641ef05da76.tar.gz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ipip.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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, tiph->protocol); return NETDEV_TX_OK; |
