From 08fc53c44c9ab23e9fabcc9a855c8478b7d1cf6e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 12:46:36 +0100
Subject: [PATCH] --- yaml --- r: 111334 b: refs/heads/master c:
 5988b63a53e120a9db4439d4512f4c1b17e7170e h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sfc/tx.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c0440184e2fd..87defd6a540d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9aafb0e91a079ff9438ce3c532ea46d4cd2f0fc
+refs/heads/master: 5988b63a53e120a9db4439d4512f4c1b17e7170e
diff --git a/trunk/drivers/net/sfc/tx.c b/trunk/drivers/net/sfc/tx.c
index e5e0bab313eb..0452ea6937ab 100644
--- a/trunk/drivers/net/sfc/tx.c
+++ b/trunk/drivers/net/sfc/tx.c
@@ -1096,6 +1096,11 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
 		efx_stop_queue(tx_queue->efx);
 
  unwind:
+	/* Free the DMA mapping we were in the process of writing out */
+	if (state.ifc.unmap_len)
+		pci_unmap_page(tx_queue->efx->pci_dev, state.ifc.unmap_addr,
+			       state.ifc.unmap_len, PCI_DMA_TODEVICE);
+
 	efx_enqueue_unwind(tx_queue);
 	return rc2;
 }