From patchwork Tue Jan 5 21:16:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kirjanov X-Patchwork-Id: 42186 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 061BCB6EF0 for ; Wed, 6 Jan 2010 08:15:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932076Ab0AEVPN (ORCPT ); Tue, 5 Jan 2010 16:15:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754764Ab0AEVPM (ORCPT ); Tue, 5 Jan 2010 16:15:12 -0500 Received: from mail-fx0-f225.google.com ([209.85.220.225]:35504 "EHLO mail-fx0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754704Ab0AEVPL (ORCPT ); Tue, 5 Jan 2010 16:15:11 -0500 Received: by fxm25 with SMTP id 25so10217448fxm.21 for ; Tue, 05 Jan 2010 13:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:reply-to:mail-followup-to:mime-version:content-type :content-disposition:user-agent; bh=Pxy4Ku2ouPM+Quh+VbNT2SiQs3SFC9DzJIoMZlAEolU=; b=RvDDbNeHHMgrE2380Q4LAhmp0frSE9uV47yT7gfspBIKrEIAyerVjHjja1cn/+G169 ajmn4JnZdD0+KdTnoa2pbpz04aurMkWREEqNOcQcep710d8UMEg3rfz8B0QAWfqMPQIy EoUgGU7ZFJ+tTBu+kYp5uGDIGgsY9UQ7tAtjY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:mail-followup-to :mime-version:content-type:content-disposition:user-agent; b=nnC1yjoebXaYuiXPHDkFady+0TR1EEF6H++dHh+I4XXGq1BPBH5BtpckOInob0kVtB Hwy9yePBLES9DMeGckQlJRFMh9lTgT3e2DqqLreYUKki4gd3euPn4w/lsSTN3v8LZVet guXxzKylDuXXb8p6SUnaGvDqbC+DOV1s48Gjs= Received: by 10.102.174.11 with SMTP id w11mr2484393mue.17.1262726109605; Tue, 05 Jan 2010 13:15:09 -0800 (PST) Received: from coldcone ([89.169.117.105]) by mx.google.com with ESMTPS id g1sm11845966muf.14.2010.01.05.13.15.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 05 Jan 2010 13:15:08 -0800 (PST) Date: Wed, 6 Jan 2010 00:16:59 +0300 From: "Denis Kirjanov To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH] vxge: use pci_dma_mapping_error to test return value Message-ID: <20100105211659.GA12882@coldcone> Reply-To: kirjanov@gmail.com Mail-Followup-To: davem@davemloft.net, netdev@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org pci_dma_mapping_error should be used to test return value of pci_map_single or pci_map_page. Signed-off-by: Denis Kirjanov --- drivers/net/vxge/vxge-main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 0fdfd58..f7ed495 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c @@ -310,7 +310,7 @@ static int vxge_rx_map(void *dtrh, struct vxge_ring *ring) dma_addr = pci_map_single(ring->pdev, rx_priv->skb_data, rx_priv->data_size, PCI_DMA_FROMDEVICE); - if (dma_addr == 0) { + if (unlikely(pci_dma_mapping_error(ring->pdev, dma_addr))) { ring->stats.pci_map_fail++; return -EIO; } @@ -821,7 +821,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) int frg_cnt, first_frg_len; skb_frag_t *frag; int i = 0, j = 0, avail; - u64 dma_pointer; + dma_addr_t dma_pointer; struct vxge_tx_priv *txdl_priv = NULL; struct __vxge_hw_fifo *fifo_hw; int offload_type;