From patchwork Wed Oct 28 14:34:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 37112 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.176.167]) by ozlabs.org (Postfix) with ESMTP id A2F46B7BE9 for ; Thu, 29 Oct 2009 01:35:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127AbZJ1Oey (ORCPT ); Wed, 28 Oct 2009 10:34:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754103AbZJ1Oex (ORCPT ); Wed, 28 Oct 2009 10:34:53 -0400 Received: from mail.solarflare.com ([216.237.3.220]:34742 "EHLO exchange.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751543AbZJ1Oex (ORCPT ); Wed, 28 Oct 2009 10:34:53 -0400 Received: from [10.17.20.50] ([10.17.20.50]) by exchange.solarflare.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 28 Oct 2009 07:34:57 -0700 Subject: [PATCHv2 net-2.6] sfc: Really allow RX checksum offload to be disabled From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com Organization: Solarflare Communications Date: Wed, 28 Oct 2009 14:34:54 +0000 Message-Id: <1256740494.2846.19.camel@achroite> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) X-OriginalArrivalTime: 28 Oct 2009 14:34:57.0356 (UTC) FILETIME=[D27110C0:01CA57DB] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-5.600.1016-16974.005 X-TM-AS-Result: No--10.944100-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We have never checked the efx_nic::rx_checksum_enabled flag everywhere we should, and since the switch to GRO we don't check it anywhere. It's simplest to check it in the one place where we initialise the per-packet checksummed flag. Signed-off-by: Ben Hutchings Cc: stable@kernel.org --- This version really is applicable to net-2.6 and 2.6.31.y, and to 2.6.27.y with fuzz 1. I'm not sure whether this bug is serious enough for a stable update but it is an obvious fix. Ben. drivers/net/sfc/falcon.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index c049364..e75674e 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -884,7 +884,9 @@ static void falcon_handle_rx_event(struct efx_channel *channel, /* If packet is marked as OK and packet type is TCP/IPv4 or * UDP/IPv4, then we can rely on the hardware checksum. */ - checksummed = RX_EV_HDR_TYPE_HAS_CHECKSUMS(rx_ev_hdr_type); + checksummed = + efx->rx_checksum_enabled && + RX_EV_HDR_TYPE_HAS_CHECKSUMS(rx_ev_hdr_type); } else { falcon_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok, &discard);