From patchwork Thu May 24 21:38:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Maxwell X-Patchwork-Id: 920116 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TVlEN/P9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sN7s5BWTz9ry1 for ; Fri, 25 May 2018 07:39:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161471AbeEXVje (ORCPT ); Thu, 24 May 2018 17:39:34 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44659 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966304AbeEXVjb (ORCPT ); Thu, 24 May 2018 17:39:31 -0400 Received: by mail-pg0-f65.google.com with SMTP id p21-v6so1345614pgd.11; Thu, 24 May 2018 14:39:31 -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; bh=nSpsnenQTOOBWQGkFsBDzg/xfd8W6RDLSrOiC/VatF8=; b=TVlEN/P9MrDUYpy4yNgOjY31JHjtQzjoYPkuQAWXVx2gsSAmXByvmTVWx12FYy6KJL 74PDI9fQkGETuAPtNAJNVu1clsEEg0UfLJqhw4aJB1NHr7NNUdTeSeYVMdTzzi16BjUF kyF2LHKiMIqISnkEcp6Qve+61q3ryQsAN6E7CdXLh2w8CvqFY8BMou1lXEHhaHAnc1fG cEjLGwM17V/RbZUfC5EaFRYy2cfeMtSDvCPUA/mQwVRoP46KGKM3Xt4CtL7KFne2MqW5 SvX+T6dN3J9EyCzse0McYcFqRecnZOicPyB7/swJ3tNikySSNOliI7VIBML8UUfR4Y5f vTKg== 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; bh=nSpsnenQTOOBWQGkFsBDzg/xfd8W6RDLSrOiC/VatF8=; b=Hwzyo2WSV8F+wz+vlVpFzS8jgNe+chRc355il4r3+q5GL4R/FvzBxE4cqQGfTeki4n AjJDU9H8l+IR5AI7rRuirPw/DS2OoT5lY7pcxX8/yCQ6ecXn6xBkhzEWtpDT1r10o/4v RnV7ELw4sFgwBEZaYmZibYiVTAIsyEz9jcPvJxr2SYmX0B4i2qMaprTlP1DBYiwsA0qw yT8UZy+wxadD6Jce4LIAvhUZViHToxnHLtl2nHHwJFANDcSlwt9KytboCmPpV+vOfUGm ULXJAy23h1cpuCK18mASrOzvPmvJaY91MDC+mGl+bx96vZQ2PmFuGeb/FmUzs1Rm0/4s UkeQ== X-Gm-Message-State: ALKqPwebu1YrvCXLbrnv5DUaE3zB7uRbwhZXfG01OQE9gsNzdEofH7sX nD2fhRqgRyniwj3pvSaEIAA= X-Google-Smtp-Source: AB8JxZpStD8SxqKIjJo9hDSGOPJwvrPfrcaC88znUmcl1fK37euDjSmkgmX1maEOT7t3NmTg/AXZzw== X-Received: by 2002:a65:5206:: with SMTP id o6-v6mr7317524pgp.157.1527197970825; Thu, 24 May 2018 14:39:30 -0700 (PDT) Received: from 192-168-1-10.tpgi.com.com (110-175-8-199.static.tpgi.com.au. [110.175.8.199]) by smtp.gmail.com with ESMTPSA id g68-v6sm37384054pfk.53.2018.05.24.14.39.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 May 2018 14:39:29 -0700 (PDT) From: Jon Maxwell To: davem@davemloft.net Cc: dsahern@gmail.com, mschiffer@universe-factory.net, zhangshengju@cmss.chinamobile.com, ktkhai@virtuozzo.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jmaxwell@redhat.com Subject: [PATCH net-next] ifb: fix packets checksum Date: Fri, 25 May 2018 07:38:29 +1000 Message-Id: <20180524213829.15208-1-jmaxwell37@gmail.com> X-Mailer: git-send-email 2.13.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixup the checksum for CHECKSUM_COMPLETE when pulling skbs on RX path. Otherwise we get splats when tc mirred is used to redirect packets to ifb. Before fix: nic: hw csum failure Signed-off-by: Jon Maxwell --- drivers/net/ifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 5f2897ec0edc..d345c61d476c 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -102,7 +102,7 @@ static void ifb_ri_tasklet(unsigned long _txp) if (!skb->tc_from_ingress) { dev_queue_xmit(skb); } else { - skb_pull(skb, skb->mac_len); + skb_pull_rcsum(skb, skb->mac_len); netif_receive_skb(skb); } }