From 1e3b79a52c970c91e94ee8632da6adeb44a245b3 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 27 Sep 2006 14:02:26 -0500 Subject: [PATCH] --- yaml --- r: 37941 b: refs/heads/master c: d4b0a4c19ace3021235a33658c520ab0da80dfb1 h: refs/heads/master i: 37939: 9f72850df6ccdfc89251930a1f44f54493559480 v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3c295f10b36d..8adb12a20cbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c73a29da23c9236f868faecf85cb5401893d7c42 +refs/heads/master: d4b0a4c19ace3021235a33658c520ab0da80dfb1 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index cc240adb7269..1397fc55cf68 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -317,7 +317,7 @@ spider_net_init_chain(struct spider_net_card *card, SPIDER_NET_DESCR_SIZE, direction); - if (buf == DMA_ERROR_CODE) + if (pci_dma_mapping_error(buf)) goto iommu_error; descr->bus_addr = buf; @@ -420,7 +420,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card, buf = pci_map_single(card->pdev, descr->skb->data, SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE); descr->buf_addr = buf; - if (buf == DMA_ERROR_CODE) { + if (pci_dma_mapping_error(buf)) { dev_kfree_skb_any(descr->skb); if (netif_msg_rx_err(card) && net_ratelimit()) pr_err("Could not iommu-map rx buffer\n"); @@ -649,7 +649,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card, dma_addr_t buf; buf = pci_map_single(card->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); - if (buf == DMA_ERROR_CODE) { + if (pci_dma_mapping_error(buf)) { if (netif_msg_tx_err(card) && net_ratelimit()) pr_err("could not iommu-map packet (%p, %i). " "Dropping packet\n", skb->data, skb->len);