From patchwork Sat Mar 16 10:32:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Paasch X-Patchwork-Id: 228205 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 B528B2C00B9 for ; Sat, 16 Mar 2013 21:32:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755659Ab3CPKcU (ORCPT ); Sat, 16 Mar 2013 06:32:20 -0400 Received: from smtp.sgsi.ucl.ac.be ([130.104.5.67]:51918 "EHLO smtp6.sgsi.ucl.ac.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755594Ab3CPKcR (ORCPT ); Sat, 16 Mar 2013 06:32:17 -0400 Received: from localhost.localdomain (unknown [62.197.125.71]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: cpaasch@smtp6.sgsi.ucl.ac.be) by smtp6.sgsi.ucl.ac.be (Postfix) with ESMTPSA id A59C61C65D5; Sat, 16 Mar 2013 11:32:10 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.3 smtp6.sgsi.ucl.ac.be A59C61C65D5 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=uclouvain.be; s=selucl; t=1363429930; bh=A4NUZzyZzrMWEvj/SkASpR9Y9vtsDarSHYlnOj5H1aQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=isuNaVrM3LuM4x+z4HCuKi9xwB0HlUhc4Cpp5JXmpdiFLmji6WZIwhH9Eq+BzFnIq NwZpmfjCVxgCezZVW1O+1aI2yMPUfFvSIRN9Tf5DIk6XZNbZk7fY7eIoehjliY8RXZ auRqv+bYYi3yYd7gbM2mxMIU5RnOIdxF5uaV42qU= From: Christoph Paasch To: Jeff Kirsher , Bruce Allan , Alex Duyck Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, David Miller Subject: [PATCH 2/3] ixgb: Add missing dma_mapping_error-call in ixgb_alloc_rx_buffers Date: Sat, 16 Mar 2013 11:32:04 +0100 Message-Id: <1363429925-12724-3-git-send-email-christoph.paasch@uclouvain.be> X-Mailer: git-send-email 1.8.1.227.g44fe835 In-Reply-To: <1363429925-12724-1-git-send-email-christoph.paasch@uclouvain.be> References: <1363429925-12724-1-git-send-email-christoph.paasch@uclouvain.be> X-Virus-Scanned: clamav-milter 0.97.3-exp at smtp-6.sipr-dc.ucl.ac.be X-Virus-Status: Clean X-Sgsi-Spamcheck: SASL authenticated, X-SGSI-MailScanner-ID: A59C61C65D5.A142C X-SGSI-MailScanner: Found to be clean X-SGSI-From: christoph.paasch@uclouvain.be X-SGSI-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After dma_map_single, dma_mapping_error must be called. It seems safe to not free the skb allocated in this function, as the skb can be reused later. Additionally this patch fixes one coding-style error. Signed-off-by: Christoph Paasch --- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index e23f023..6662c7c 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -2155,6 +2155,10 @@ map_skb: skb->data, adapter->rx_buffer_len, DMA_FROM_DEVICE); + if (dma_mapping_error(&pdev->dev, buffer_info->dma)) { + adapter->alloc_rx_buff_failed++; + break; + } rx_desc = IXGB_RX_DESC(*rx_ring, i); rx_desc->buff_addr = cpu_to_le64(buffer_info->dma); @@ -2164,7 +2168,8 @@ map_skb: rx_desc->status = 0; - if (++i == rx_ring->count) i = 0; + if (++i == rx_ring->count) + i = 0; buffer_info = &rx_ring->buffer_info[i]; }