From patchwork Fri Oct 3 22:48:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 396471 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D434614007B for ; Sat, 4 Oct 2014 08:48:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756057AbaJCWsq (ORCPT ); Fri, 3 Oct 2014 18:48:46 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36259 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755090AbaJCWsl (ORCPT ); Fri, 3 Oct 2014 18:48:41 -0400 Received: by mail-pa0-f48.google.com with SMTP id eu11so2203503pac.21 for ; Fri, 03 Oct 2014 15:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=c2GHR5f6CGb++eDOkK7DyvMBA2B9iW3y6lFheqtZhPM=; b=iMaawxEzF9L+0OxAiS8QxGGfHkEpw4BUz9u+SgCuO9H4ECDXVDnc2xtqtYh5zUfRkJ LRSlCpY0i16iciuUtwPv/1vXbp2tfNNwvpOvjamGTD7KLRsGEHBD2UtIts56K6xQtPLL r3gp0IR9xbSbx9vGInh9sX4wDyW3LwbMxdyobiLEI/wzumrnhtiuKuzgeASumMs6Kz1K 7bjIrYfryNcItlebWD2/XuHxSvc17Fc184n5GggAekAchv7492QJVbciufbjUVHSIIzu 9YrqetUcqHYt6WfC1xT0bnxHRL9R6AMTZgnFhcJ6meSFdu7Y3vH1CKA/4GLM76zBZmL2 4FzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=c2GHR5f6CGb++eDOkK7DyvMBA2B9iW3y6lFheqtZhPM=; b=UY5q/WzuR+8HWGorWEzphGZEaUbfJwt3E26iKy6TZWGaQskX/LwEJt4C8HI8k9BFgb B6PsKvYXktbrug850rcy6CJ1CzNNip2PkWj1o+e3jdwg2GKjOEWOozWKAlLv6+JPUtKF u6dWVeB4twMfkD9qpsNN0cmrP6B01vWYm5pi4bdNIqrIV3rSs9oFMTKpl4qH2lIhT2Vl WFUvGxBm31SDJmccllxQfAd0RXqhhEaGl4QIgQjIx78fvztgsIpU037PDnQYGM9HZxU/ 1X1zvHBPpuP9prqxSraPh9DkZo7tgnOol5JJBZdzvMNKRVWpuOIbvmiA+rkk/KsgMTUD xBbw== X-Gm-Message-State: ALoCoQmPenbUGK/Ry5qSkzlLY76B7qYp8Nl3JXN69vdi1cKAM5ZNFqQv16P+WgFebMRK79O3MYpL X-Received: by 10.70.129.136 with SMTP id nw8mr3591990pdb.128.1412376520723; Fri, 03 Oct 2014 15:48:40 -0700 (PDT) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.18.117.126]) by mx.google.com with ESMTPSA id ti8sm7356827pac.20.2014.10.03.15.48.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 Oct 2014 15:48:40 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH v2 net-next 1/4] ip_tunnel: Account for secondary encapsulation header in max_headroom Date: Fri, 3 Oct 2014 15:48:07 -0700 Message-Id: <1412376490-8774-2-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412376490-8774-1-git-send-email-therbert@google.com> References: <1412376490-8774-1-git-send-email-therbert@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When adjusting max_header for the tunnel interface based on egress device we need to account for any extra bytes in secondary encapsulation (e.g. FOU). Signed-off-by: Tom Herbert --- net/ipv4/ip_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index b75b47b..54ace25 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -759,7 +759,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, df |= (inner_iph->frag_off&htons(IP_DF)); max_headroom = LL_RESERVED_SPACE(rt->dst.dev) + sizeof(struct iphdr) - + rt->dst.header_len; + + rt->dst.header_len + ip_encap_hlen(&tunnel->encap); if (max_headroom > dev->needed_headroom) dev->needed_headroom = max_headroom;