From a4c7aa2f454269c7943e6ba9287caf35e7448c2f Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Fri, 21 Sep 2012 00:14:14 +0000 Subject: [PATCH] --- yaml --- r: 340471 b: refs/heads/master c: 6132ee8a3f123bdaf8682ede07c17b294ecbd255 h: refs/heads/master i: 340469: 2e8ffde89655958f27de8ddfdb10994d25a28346 340467: 436023105b923a3ad1faf9b18ef44b8c48d55ae6 340463: fc454b01d6d0dcccae792403ea91f8e5a2cff1fd v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7af11ae26dc..bf3748a74987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f44777024c9147932c0ec2af41ed2cd50ac151c3 +refs/heads/master: 6132ee8a3f123bdaf8682ede07c17b294ecbd255 diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 537ed191074a..805e02cf74aa 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -359,6 +359,12 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter, bi->dma = dma_map_single(&pdev->dev, skb->data, rx_ring->rx_buf_len, DMA_FROM_DEVICE); + if (dma_mapping_error(&pdev->dev, bi->dma)) { + dev_kfree_skb(skb); + bi->skb = NULL; + dev_err(&pdev->dev, "RX DMA map failed\n"); + break; + } } rx_desc->read.pkt_addr = cpu_to_le64(bi->dma); @@ -2817,10 +2823,10 @@ static int ixgbevf_tx_map(struct ixgbevf_ring *tx_ring, tx_buffer_info->dma = skb_frag_dma_map(tx_ring->dev, frag, offset, size, DMA_TO_DEVICE); - tx_buffer_info->mapped_as_page = true; if (dma_mapping_error(tx_ring->dev, tx_buffer_info->dma)) goto dma_error; + tx_buffer_info->mapped_as_page = true; tx_buffer_info->next_to_watch = i; len -= size;