Merge tag 'mac80211-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/linux/kerne...

[deliverable/linux.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 4044da61e7479e8da8a74a4d97039b190d1d57c6..ec51d02166de66744f27092f1490bb635c9a70bc 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -195,7 +195,7 @@ static int ipip_rcv(struct sk_buff *skb)
        if (tunnel) {
                if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
                        goto drop;
-               if (iptunnel_pull_header(skb, 0, tpi.proto))
+               if (iptunnel_pull_header(skb, 0, tpi.proto, false))
                        goto drop;
                return ip_tunnel_rcv(tunnel, skb, &tpi, NULL, log_ecn_error);
        }
@@ -219,7 +219,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
        if (unlikely(skb->protocol != htons(ETH_P_IP)))
                goto tx_error;
 
-       skb = iptunnel_handle_offloads(skb, false, SKB_GSO_IPIP);
+       skb = iptunnel_handle_offloads(skb, SKB_GSO_IPIP);
        if (IS_ERR(skb))
                goto out;