Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp436650imu; Wed, 12 Dec 2018 20:52:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/VbN0A/c9OlUVdMd7LctcHplK0jhO3d/AQLPu7V9HGUNxHkYKiL1y7jXeRweFE2ovk75nWs X-Received: by 2002:a63:5122:: with SMTP id f34mr19862965pgb.218.1544676753071; Wed, 12 Dec 2018 20:52:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676753; cv=none; d=google.com; s=arc-20160816; b=hIa6YFQ31IK8o+fVkYlNYzf3ir4kZHhKv7MRjuylpEqgyt9fg6ZPu8lq+KSmf/YR06 UznibDch/p00TRjIuO7CAa/nUVR4HGEECtU+JJrwiW3N6pFY8RWMeEgKkOWuYHPdAqQ7 M5n6bOjIPZLNtbkFE39Oq06cdnB6UGy1+y/BRQxG/UKe0JMaQX3Ukl5yMh9Pt/R4QCsF KzlaUNIk3OTakOynkFzB4nvbhhFeSbheA+4XFnUcAsObOvuK9OpJtI1gdJheT+YHBgKS JA+P8rKHHxzqTRjvkZGcWiXie485X1lOwjhFickiUOu1cUlHOEyoxXE/RpTOUEZoprJo C9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gp1yw9hpJzKoPcBZbwcr6rVGiqvLIslmQCn+IZzo3Hc=; b=tlPLl07pTCkClYKyk7m9GoNFFHcuTRJi/FL1ZJ0tHKthliQ9+vfT6oFRJdsCvhQUtE 0AvrECkNGqrvhZ34sH1CxHelcEfcXfXXkc76CSuHtX8G10YIIOj+/Wt5By9iP1OJke9q 35GpCqZ08byeRBV2oHhJnoPF4b6cUPNBA7D/74P6POrFF7rLQLmn4J21HgTmEigrJziu /+98xobqCkPqXpMwvsRhq2sya0eqRPmtwA8sYwUhwhSDuJDkK4MYwRt1/SE/1Jyc48HW yAVf0FEzpAY63i/tMu060VNMoQyl6Im5hhxI/z04777Tr3nmh9DGGbaIHSqQvOpAvU+u K64g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AvKB5KzX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si695735pgo.9.2018.12.12.20.52.18; Wed, 12 Dec 2018 20:52:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AvKB5KzX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727529AbeLME3R (ORCPT + 99 others); Wed, 12 Dec 2018 23:29:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:42260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727482AbeLME3P (ORCPT ); Wed, 12 Dec 2018 23:29:15 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A0F4A20873; Thu, 13 Dec 2018 04:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675354; bh=cjPv1SgfIN+9gmFf3f2owrw0kwnxR47hRvSI03XLCaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AvKB5KzXm3utGmiMgAXg7pGDNdtCCk6iAGZozc+RwKdv1U0lULUfz1qbGDxAhkXEo HlCiVGjqyrdhwAx9bb+18FTAXLhehXBWMk9rJPFRQ4r9tDBhu/MrCBGGFpQ43g9KMs aWFpHT2wmHqJFQvp+kT/2Qf7tm/TqmYvJ6yFHRSs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Bogdanov , Igor Russkikh , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 21/73] net: aquantia: fix rx checksum offload bits Date: Wed, 12 Dec 2018 23:27:46 -0500 Message-Id: <20181213042838.75160-21-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Bogdanov [ Upstream commit 37c4b91f955fdd5f4ad771956b97d35f1321098e ] The last set of csum offload fixes had a leak: Checksum enabled status bits from rx descriptor were incorrectly interpreted. Consequently all the other valid logic worked on zero bits. That caused rx checksum offloads never to trigger. Tested by dumping rx descriptors and validating resulting csum_level. Reported-by: Igor Russkikh Signed-off-by: Dmitry Bogdanov Signed-off-by: Igor Russkikh Fixes: ad703c2b9127f ("net: aquantia: invalid checksumm offload implementation") Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index 88705dee5b95..56363ff5c891 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -667,7 +667,7 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, rx_stat = (0x0000003CU & rxd_wb->status) >> 2; - is_rx_check_sum_enabled = (rxd_wb->type) & (0x3U << 19); + is_rx_check_sum_enabled = (rxd_wb->type >> 19) & 0x3U; pkt_type = 0xFFU & (rxd_wb->type >> 4); -- 2.19.1