From a737630f7883e2a73a443d8a5a00628daa1c542a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 11 Sep 2008 15:45:19 -0700
Subject: [PATCH] --- yaml --- r: 111601 b: refs/heads/master c:
 638266f7e879e34de4a4635049c15f5a58505e75 h: refs/heads/master i:   111599:
 24afc360d535a866b8865f7796e13d954b7c697a v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b62d393fb6b..0a5ca2e0f782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90079ce89aa65e17f36ac2b09110720c51d874f4
+refs/heads/master: 638266f7e879e34de4a4635049c15f5a58505e75
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 355e8bcf6fed..123920759efd 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -4631,6 +4631,9 @@ static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
 		 * Drop the packet if it does.
 		 */
 		if (ret || tg3_4g_overflow_test(new_addr, new_skb->len)) {
+			if (!ret)
+				skb_dma_unmap(&tp->pdev->dev, new_skb,
+					      DMA_TO_DEVICE);
 			ret = -1;
 			dev_kfree_skb(new_skb);
 			new_skb = NULL;