From patchwork Fri Dec 15 22:27:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 849398 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="GX36801a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yz4nb6CM9z9sRg for ; Sat, 16 Dec 2017 09:28:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932794AbdLOW2A (ORCPT ); Fri, 15 Dec 2017 17:28:00 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44491 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757104AbdLOW1z (ORCPT ); Fri, 15 Dec 2017 17:27:55 -0500 Received: by mail-pg0-f65.google.com with SMTP id j9so6692555pgc.11 for ; Fri, 15 Dec 2017 14:27:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=morfi/iXewNuPH2c0TiZjRJyq7gmvaZ28aZbSaeP6n8=; b=GX36801awqPandM/9gmcoT3Wm5/Ir/QnkZUJBv8juU89BeVqbCDIprLU+fdcQtiMgz O6GbuJ4/GgcUL7OnYhsEPze5t56tLyrOyPKZwRuAyZWaT4ZQmS2GAv6rELI6gKZ1ArGs /M1LpBIQoNdFZOTATLP5eLqunJjFUZfWnpVTnpp552i+QjraHzd4C5OG2ykUWFFthaga Z0UrjamBTrdDoSz+iV6miuOLfmvSM1kTRbsu6xiVCrPojXm7Hw4M91jhQ7YDS/pMt3rq gL6WeUN2msEVvYam2kdAu8fz5PyO/WQBTggtkq923w51n55J1R2Vh8Wb3fLoAU5bYAD6 Jl8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=morfi/iXewNuPH2c0TiZjRJyq7gmvaZ28aZbSaeP6n8=; b=BHgYy7ghDylH2U/o7oy4KICD8M/F6hGqh7K+tWQcxwCiFxz7GMGSlM2ZPnadvBddmM 88OdREH2SizeariQ0escJtCTYQf0/HePIcxQTPe3B0simTPIZi+3F4Y72i08Sfpb7L/8 x0E57EuMs+k6gXGzWEUxHDxUAZ+Z3TkeqUO+Q0WH6k2hhGB0uzYQaLNRDNjiRBW/nUQe mZXX6zBgGSH14hO9I0sETgu/DL0x6Dv73oiwAOqQGVp5gt8qKMAi1toBPH62ymyTph4o LW6YjzG5a9N/MRtAvCW3QDKXBkGfjpHI48v+sflEMXV5fYW0U+BHVSAUkOUerM9WaV+X cGMA== X-Gm-Message-State: AKGB3mKuId7qatVveS38HupNQMDPmueZEJAh+bl255Wr6olc7Rf8Py23 7w43RQ01/SHu1IIfgNZxHtKZPjC9 X-Google-Smtp-Source: ACJfBovaL3x2WsbTjEf+5JyaNa2uIRf653rOY9/3yST/mIOPU9hgGAOKp+jiZaIlNHLllMVyIJTJqw== X-Received: by 10.99.138.194 with SMTP id y185mr13095547pgd.290.1513376874233; Fri, 15 Dec 2017 14:27:54 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id o84sm16386093pfa.46.2017.12.15.14.27.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Dec 2017 14:27:53 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net-next 0/2] net: erspan: a couple fixes Date: Fri, 15 Dec 2017 14:27:42 -0800 Message-Id: <1513376864-33777-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Haishuang Yan reports a couple of issues (wrong return value, pskb_may_pull) on erspan V1. Since erspan V2 is in net-next, this series fix the similar issues on v2. William Tu (2): net: erspan: fix wrong return value net: erspan: reload pointer after pskb_may_pull net/ipv4/ip_gre.c | 6 ++++-- net/ipv6/ip6_gre.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)