From 3edd7cd0b0b4b19c94c6f715a3e05d08ec6baa2e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 2 Aug 2007 19:21:30 +0100 Subject: [PATCH] --- yaml --- r: 63651 b: refs/heads/master c: 3e847423bf029c2170692c75580a856debed617b h: refs/heads/master i: 63649: 9a3c93a333ec4e59d20fdd3ecd05e7da6416111a 63647: b8b22c6efd31d0b501f0efa4b5aacc33fc9ca77e v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0eb65b47a04c..770b8a097d23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c73d83473e47415e943c398e6612f65f6da5b3c9 +refs/heads/master: 3e847423bf029c2170692c75580a856debed617b diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 2be0a0f1b48f..24feb00600ee 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -2430,7 +2430,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no) (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) { pci_unmap_single (nic->pdev, - (dma_addr_t)skb->data, + (dma_addr_t)rxdp3->Buffer2_ptr, dev->mtu + 4, PCI_DMA_FROMDEVICE); goto pci_map_failed; @@ -6211,7 +6211,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, if( (rxdp3->Buffer0_ptr == 0) || (rxdp3->Buffer0_ptr == DMA_ERROR_CODE)) { pci_unmap_single (sp->pdev, - (dma_addr_t)(*skb)->data, + (dma_addr_t)rxdp3->Buffer2_ptr, dev->mtu + 4, PCI_DMA_FROMDEVICE); goto memalloc_failed; } @@ -6224,7 +6224,10 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, if( (rxdp3->Buffer1_ptr == 0) || (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) { pci_unmap_single (sp->pdev, - (dma_addr_t)(*skb)->data, + (dma_addr_t)rxdp3->Buffer0_ptr, + BUF0_LEN, PCI_DMA_FROMDEVICE); + pci_unmap_single (sp->pdev, + (dma_addr_t)rxdp3->Buffer2_ptr, dev->mtu + 4, PCI_DMA_FROMDEVICE); goto memalloc_failed; }