netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Denis Kirjanov <kirjanov@gmail.com" <kirjanov@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH] vxge: use pci_dma_mapping_error to test return value
Date: Sat, 9 Jan 2010 22:52:22 +0300	[thread overview]
Message-ID: <20100109195222.GA4271@coldcone> (raw)
In-Reply-To: <20100108.005528.263100819.davem@davemloft.net>

On Fri, Jan 08, 2010 at 00:55 -0800, David Miller wrote:
> From: "Denis Kirjanov <kirjanov@gmail.com" <kirjanov@gmail.com>
> Date: Wed, 6 Jan 2010 00:16:59 +0300
> 
> > @@ -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;
> 
> This will cause build warnings on platforms withe dma_addr_t
> is some type other than "unsigned long long", such as on
> sparc64 where it is a u32.
> 
> This is because of the %ll printf format used to display it
> a few lines down from here.
My mistake. Fixed one.

pci_dma_mapping_error should be used to test return value of
pci_map_single or pci_map_page.

Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
---

 drivers/net/vxge/vxge-main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 0fdfd58..b9685e8 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;
 	}

  reply	other threads:[~2010-01-09 19:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-05 21:16 [PATCH] vxge: use pci_dma_mapping_error to test return value Denis Kirjanov <kirjanov@gmail.com
2010-01-08  8:55 ` David Miller
2010-01-09 19:52   ` Denis Kirjanov <kirjanov@gmail.com [this message]
2010-01-10 21:40     ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100109195222.GA4271@coldcone \
    --to=kirjanov@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).