--- drivers/net/wireless/p54/p54pci.c

+++ drivers/net/wireless/p54/p54pci.c

@@ -198,7 +198,6 @@ static void p54p_check_rx_ring(struct ie

while (i != idx) {

u16 len;

struct sk_buff *skb;

- dma_addr_t dma_addr;

desc = &ring[i];

len = le16_to_cpu(desc->len);

skb = rx_buf[i];

@@ -216,20 +215,17 @@ static void p54p_check_rx_ring(struct ie

len = priv->common.rx_mtu;

}

- dma_addr = le32_to_cpu(desc->host_addr);

- pci_dma_sync_single_for_cpu(priv->pdev, dma_addr,

- priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

skb_put(skb, len);

if (p54_rx(dev, skb)) {

- pci_unmap_single(priv->pdev, dma_addr,

- priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

+ pci_unmap_single(priv->pdev,

+ le32_to_cpu(desc->host_addr),

+ priv->common.rx_mtu + 32,

+ PCI_DMA_FROMDEVICE);

rx_buf[i] = NULL;

- desc->host_addr = cpu_to_le32(0);

+ desc->host_addr = 0;

} else {

skb_trim(skb, 0);

- pci_dma_sync_single_for_device(priv->pdev, dma_addr,

- priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

desc->len = cpu_to_le16(priv->common.rx_mtu + 32);

}