From 9d6ff944e169c7beba8bf2dd7c01276690b6e4fb Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Mon, 6 Feb 2012 08:39:50 +0000 Subject: [PATCH] --- yaml --- r: 287513 b: refs/heads/master c: 7e2eb99cc6207e4464f018f72c67c55f2b1c93a4 h: refs/heads/master i: 287511: 40ae3081e16e4b3d07899a6c0565ab1c2dd236cf v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54b8ac786061..af481e00b01d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68355f71132bec25e0d89b2d8d3ed01286307d31 +refs/heads/master: 7e2eb99cc6207e4464f018f72c67c55f2b1c93a4 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c index d1c631e8293a..d4ad8c226b51 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -168,8 +168,12 @@ static int mlx4_en_prepare_rx_desc(struct mlx4_en_priv *priv, return 0; err: - while (i--) + while (i--) { + dma_addr_t dma = be64_to_cpu(rx_desc->data[i].addr); + pci_unmap_single(priv->mdev->pdev, dma, skb_frags[i].size, + PCI_DMA_FROMDEVICE); put_page(skb_frags[i].page); + } return -ENOMEM; }