---

yaml --- r: 287513 b: refs/heads/master c: 7e2eb99 h: refs/heads/master i: 287511: 40ae308 v: v3
git-mirror · Feb 6, 2012 · 9d6ff94 · 9d6ff94
1 parent b3f88f4
commit 9d6ff94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;
 }