From patchwork Sat Mar 20 12:27:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Teras X-Patchwork-Id: 48209 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 0019EB7D0B for ; Sat, 20 Mar 2010 23:28:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751994Ab0CTM2G (ORCPT ); Sat, 20 Mar 2010 08:28:06 -0400 Received: from ey-out-2122.google.com ([74.125.78.24]:53265 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965Ab0CTM2E (ORCPT ); Sat, 20 Mar 2010 08:28:04 -0400 Received: by ey-out-2122.google.com with SMTP id d26so359442eyd.19 for ; Sat, 20 Mar 2010 05:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=ssbAdi7hmQAqwcUmaRF+IdI0GY0om11A6EMOfVj26ew=; b=BKooFo9f0+VzuH6HLM8X7tOPMMl5AGRgbI0GpRH2qKm0vQLiktKlW3OziOtPIsJq6x 5IzjZQ6LS685+4A464UjjXCML9ha4achjJqQbTcIznQZKGt+dH+FLEcbTwB0T14ng3p7 uPvLbhEuest9d7UqRoAuM0QWz5MJp/0khn+ck= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=M21yUHBGP2zI+62DU0ZA5/VvGr60zZAZJWyBrhXRVPznf8o3sSGd6sQppct9m6jNdq 1+myRZhYKCZYPg493budstpb9Cu+Eo2r4ZwI13lgDfYooBjsaPeefIwTu0Apa13DXoBm cirT7C9qO8mOSSawijliQ7HY7mcVVv6o0Y7vk= Received: by 10.213.95.129 with SMTP id d1mr3377406ebn.13.1269088082942; Sat, 20 Mar 2010 05:28:02 -0700 (PDT) Received: from localhost.localdomain (letku109.adsl.netsonic.fi [194.29.195.109]) by mx.google.com with ESMTPS id 13sm1108727ewy.1.2010.03.20.05.28.01 (version=SSLv3 cipher=RC4-MD5); Sat, 20 Mar 2010 05:28:02 -0700 (PDT) From: Timo Teras To: netdev@vger.kernel.org Cc: Timo Teras , Herbert Xu Subject: [PATCH] ip_gre: include route header_len in max_headroom calculation Date: Sat, 20 Mar 2010 14:27:58 +0200 Message-Id: <1269088078-7343-1-git-send-email-timo.teras@iki.fi> X-Mailer: git-send-email 1.6.3.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Taking route's header_len into account, and updating gre device needed_headroom will give better hints on upper bound of required headroom. This is useful if the gre traffic is xfrm'ed. Signed-off-by: Timo Teras Cc: Herbert Xu Acked-by: Herbert Xu --- net/ipv4/ip_gre.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) This was earlier discussed in netdev thread: http://marc.info/?t=124470870200004&r=1&w=2 I just never got to writing the patch until now. diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index f47c9f7..f78402d 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -810,11 +810,13 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev tunnel->err_count = 0; } - max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; + max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); + if (max_headroom > dev->needed_headroom) + dev->needed_headroom = max_headroom; if (!new_skb) { ip_rt_put(rt); txq->tx_dropped++;