lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[43/89] sfc: Fix DMA mapping cleanup in case of an error in TSO
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Neil Turton <nturton@solarflare.com>

    commit a7ebd27a13757248863cd61e541af7fa9e7727ee upstream.

    We need buffer->len to remain valid to work out the correct address to
    be unmapped. We therefore need to clear buffer->len after the unmap
    operation.

    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/sfc/tx.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/sfc/tx.c
    +++ b/drivers/net/sfc/tx.c
    @@ -823,8 +823,6 @@ static void efx_enqueue_unwind(struct ef
    tx_queue->efx->type->txd_ring_mask];
    efx_tsoh_free(tx_queue, buffer);
    EFX_BUG_ON_PARANOID(buffer->skb);
    - buffer->len = 0;
    - buffer->continuation = true;
    if (buffer->unmap_len) {
    unmap_addr = (buffer->dma_addr + buffer->len -
    buffer->unmap_len);
    @@ -838,6 +836,8 @@ static void efx_enqueue_unwind(struct ef
    PCI_DMA_TODEVICE);
    buffer->unmap_len = 0;
    }
    + buffer->len = 0;
    + buffer->continuation = true;
    }
    }




    \
     
     \ /
      Last update: 2010-03-31 01:17    [W:0.040 / U:30.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site