[PATCH] spidernet: fix HW structures for 64 bit dma_addr_t

The driver incorrectly used dma_addr_t to describe
HW structures and consequently broke when that type
was changed in 2.6.15-rc.

This changed spidernet to use u32 for 32 bit HW defined
structure elements.

From: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 94e238f6ed31d62adae483aec9b65416b2e97226..86969191c3f7bdba9bc0dbf0870e3e155d8d0a38 100644 (file)
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -480,6 +480,7 @@ static int
 spider_net_prepare_rx_descr(struct spider_net_card *card,
                            struct spider_net_descr *descr)
 {
+       dma_addr_t buf;
        int error = 0;
        int offset;
        int bufsize;
@@ -510,10 +511,11 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
        if (offset)
                skb_reserve(descr->skb, SPIDER_NET_RXBUF_ALIGN - offset);
        /* io-mmu-map the skb */
-       descr->buf_addr = pci_map_single(card->pdev, descr->skb->data,
+       buf = pci_map_single(card->pdev, descr->skb->data,
                                         SPIDER_NET_MAX_MTU,
                                         PCI_DMA_BIDIRECTIONAL);
-       if (descr->buf_addr == DMA_ERROR_CODE) {
+       descr->buf_addr = buf;
+       if (buf == DMA_ERROR_CODE) {
                dev_kfree_skb_any(descr->skb);
                if (netif_msg_rx_err(card))
                        pr_err("Could not iommu-map rx buffer\n");
@@ -914,15 +916,16 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
                            struct spider_net_descr *descr,
                            struct sk_buff *skb)
 {
-       descr->buf_addr = pci_map_single(card->pdev, skb->data,
-                                        skb->len, PCI_DMA_BIDIRECTIONAL);
-       if (descr->buf_addr == DMA_ERROR_CODE) {
+       dma_addr_t buf = pci_map_single(card->pdev, skb->data,
+                                       skb->len, PCI_DMA_BIDIRECTIONAL);
+       if (buf == DMA_ERROR_CODE) {
                if (netif_msg_tx_err(card))
                        pr_err("could not iommu-map packet (%p, %i). "
                                  "Dropping packet\n", skb->data, skb->len);
                return -ENOMEM;
        }
 
+       descr->buf_addr = buf;
        descr->buf_size = skb->len;
        descr->skb = skb;
        descr->data_status = 0;

diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 22b2f2347351a281e80723ea4b748d16940ee3b1..98f11ecf48fc584c556f55264530624e004183d6 100644 (file)
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -373,9 +373,9 @@ enum spider_net_descr_status {
 
 struct spider_net_descr {
        /* as defined by the hardware */
-       dma_addr_t buf_addr;
+       u32 buf_addr;
        u32 buf_size;
-       dma_addr_t next_descr_addr;
+       u32 next_descr_addr;
        u32 dmac_cmd_status;
        u32 result_size;
        u32 valid_size; /* all zeroes for tx */