From patchwork Tue Nov 25 17:30:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 414802 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 0D45F1401D0 for ; Wed, 26 Nov 2014 04:34:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751280AbaKYReq (ORCPT ); Tue, 25 Nov 2014 12:34:46 -0500 Received: from mail-ie0-f172.google.com ([209.85.223.172]:38860 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751218AbaKYRep (ORCPT ); Tue, 25 Nov 2014 12:34:45 -0500 Received: by mail-ie0-f172.google.com with SMTP id tr6so1008248ieb.3 for ; Tue, 25 Nov 2014 09:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id; bh=qNClDIctIujUbiZHQuUjJ94SS0HoWjKIGQVcQH4pphA=; b=MgHwVCwiq+DVld6vOlMO7yluSmIEq/D7Vk/eG0zaaAlwQMqNKyoJvn2Js/4JJkOg1v ESND2tHJzVqLuMzvDQpBsUb6pl1zXtaHWh/aEn09+8GHRfN4QU9VTYwuEzdU2hkCNVgs wi4iiHkhRhWEdUUE+dsgTqoGxAwYtbEzrYUnjjetfolK9uBFX7LjEBSva/bg/5YqUbRL m82sTDNExUZidQawlcQBaOOGuj6x931KZ5TVLuG0A7A5PB1XXak6YcTiudKMIZ0si+q/ A+pF3UyrBXb/ydWdzkGtUh5SJXBDgtIvnK3G6oQvAqUfhlsuVDpaEV8XJJYa/e00nDJZ 7lWg== 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; bh=qNClDIctIujUbiZHQuUjJ94SS0HoWjKIGQVcQH4pphA=; b=jm5KaMpUKpCasmTAw/JMYPCsU0IzKlaCbQsVvx6cr2TQr6OVsoJQ7gjn6NDQlek1p4 koFS5xvWmrcO7HhGzQWXhkOmDzL+MAgjBr212ycNK98+RRFCF+LUOXh4itmc51wxxBuj UmQPJy+rUioPIErsJpiO3CrQCCioatf0NyE9MDNB19Fe5VV7VeXW+rjCY6wHBq/qyLL6 hskgBETkbX8HQCWM0RGqin492ohjmxweYUOk2ar/EGalWxbxM0zYHvTWa9ZSAW8LEAR0 pOodDNut9sG8odcw2vwuHZlazESrbIdIeB82A/rbvYgM58zpal8xF9mhTxYpQeTFWp80 qbwQ== X-Gm-Message-State: ALoCoQmDqbuqGcCFR9ip/Vd1mJmRZ3D0zriPOxNevrs5PvqRuByNcWNIwmw3N2ch5ZJJMdp+KhL/ X-Received: by 10.50.3.67 with SMTP id a3mr18390022iga.42.1416936884684; Tue, 25 Nov 2014 09:34:44 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id kv4sm6363394igb.13.2014.11.25.09.34.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 09:34:44 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, linux@stwm.de, netdev@vger.kernel.org Subject: [PATCH net-next] gre: Set inner mac header in gro complete Date: Tue, 25 Nov 2014 09:30:11 -0800 Message-Id: <1416936611-22702-1-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Set the inner mac header to point to the GRE payload when doing GRO. This is needed if we proceed to send the packet through GRE GSO which now uses the inner mac header instead of inner network header to determine the length of encapsulation headers. Reported-by: Wolfgang Walter Signed-off-by: Tom Herbert --- net/ipv4/gre_offload.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index bb5947b..51973dd 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -247,6 +247,9 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff) err = ptype->callbacks.gro_complete(skb, nhoff + grehlen); rcu_read_unlock(); + + skb_set_inner_mac_header(skb, nhoff + grehlen); + return err; }