From patchwork Mon Oct 9 20:47:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 823503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TAQCjbvA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y9slD5DrQz9t5R for ; Tue, 10 Oct 2017 07:48:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754830AbdJIUsG (ORCPT ); Mon, 9 Oct 2017 16:48:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35742 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754295AbdJIUsE (ORCPT ); Mon, 9 Oct 2017 16:48:04 -0400 Received: by mail-pf0-f196.google.com with SMTP id i23so30357973pfi.2 for ; Mon, 09 Oct 2017 13:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=54vtuabB65QOPD93tkO3LVWTNto2qFRgRchZZifJkBc=; b=TAQCjbvAUq+wORrUR6pC3hTiw/4ilXiTnInOsnt+BWXpUm1bk0DBJTlLwbFDU2AKCz LZ+FZVf4rdp/wYjDbdE5FOrCrPJoGvi+iwLbZuPQaD4DZtmAY/DBwLpzSFhLhpMhDuiE wo3QwHDwYHV8+H4fntbzuYIaBXlsSOv62WNCWCpu7ewfEldWL4j+XztrTbskbyzCmHkT k7INztPqlmQueXtHYiSkfgbd2OBWj0PJygn/mF7l0dEnmtSFxBm6FnibCi9Qi9Xn0S5d mUCccmTM74GlFvsnkTocg78gl44qiWYZ5+4Qq6eXnp+A69qd3xmeQaUpbKpQ3ltuGpHD FN6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=54vtuabB65QOPD93tkO3LVWTNto2qFRgRchZZifJkBc=; b=p5PG51Fdve3DnPckmqaQpXVVpUXkKFotS96zgK0V9MvKhFPiEHBm3JwgOyEBTgBnVv UYGnMUredbLvDINVbjMuhEQPTFqeIEjejTNDBWGZLJJ3/+8LbtwVzbki8SkthYPVK4+H 9rYxsbbEvAsWuxF+RFin83GBg/w0/mBsdrn1SINFsI6ibn9bdteKnlk1onWKlSKxDdRw 6iBDTkHhuVAPfPyj4CyPxPv2WqgCj+U35gdNoqcL1ElP+lH9QGL/bIn7RIxGuv3luSmN VS6a+rmweTVx99LFZ1zbUGlcg+FUZ81PZe7LlUXA3xfDseC+sNWNc/lw3KpruTsq8oOX ImLw== X-Gm-Message-State: AMCzsaXNlHo/jWlzLRZgOX7Lo5fHnJZ95qa20FlyGXWVWxMHejsoS+s0 VAL12cn0+L3/SxVyX10DdJiwUaiU X-Google-Smtp-Source: AOwi7QCuvE70KS9GleA/twW2aXiCMXuAMbZnYmjYGCHpX49iQSSo5r+rbBVvhealnJgg2bQaeL1lvg== X-Received: by 10.98.15.77 with SMTP id x74mr5384400pfi.17.1507582083546; Mon, 09 Oct 2017 13:48:03 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id p71sm17861098pfl.56.2017.10.09.13.48.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 13:48:02 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Cc: Tom Herbert Subject: [net-next 1/3] ip_gre: fix mtu and headroom size Date: Mon, 9 Oct 2017 13:47:45 -0700 Message-Id: <1507582067-36718-2-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507582067-36718-1-git-send-email-u9012063@gmail.com> References: <1507582067-36718-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ip_gre_calc_hlen() already counts gre's base header len (4-byte) plus optional header's len, so tunnel->hlen has the entire gre headeri + options len. Thus, remove the -4 and +4 when calculating the needed_headroom and mtu. Fixes: 4565e9919cda ("gre: Setup and TX path for gre/UDP foo-over-udp encapsulation") Signed-off-by: William Tu Cc: Tom Herbert --- net/ipv4/ip_gre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index c105a315b1a3..286065c35959 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -947,8 +947,8 @@ static void __gre_tunnel_init(struct net_device *dev) t_hlen = tunnel->hlen + sizeof(struct iphdr); - dev->needed_headroom = LL_MAX_HEADER + t_hlen + 4; - dev->mtu = ETH_DATA_LEN - t_hlen - 4; + dev->needed_headroom = LL_MAX_HEADER + t_hlen; + dev->mtu = ETH_DATA_LEN - t_hlen; dev->features |= GRE_FEATURES; dev->hw_features |= GRE_FEATURES;