| From romieu@fr.zoreil.com Wed Sep 3 09:37:25 2008 |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| Date: Thu, 28 Aug 2008 22:55:33 +0200 |
| Subject: r8169: balance pci_map / pci_unmap pair |
| To: stable@kernel.org |
| Cc: Andrew Morton <akpm@linux-foundation.org>, Marcus Sundberg <marcus@ingate.com>, Jeff Garzik <jgarzik@redhat.com> |
| Message-ID: <20080828205533.GA599@electric-eye.fr.zoreil.com> |
| |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| |
| commit a866bbf6aacf95f849810079442a20be118ce905 upstream |
| |
| The leak hurts with swiotlb and jumbo frames. |
| |
| Fix http://bugzilla.kernel.org/show_bug.cgi?id=9468. |
| |
| Heavily hinted by Ilpo Jรคrvinen <ilpo.jarvinen@helsinki.fi>. |
| |
| Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> |
| Tested-by: Alistair John Strachan <alistair@devzero.co.uk> |
| Tested-by: Timothy J Fontaine <tjfontaine@atxconsulting.com> |
| Cc: Edward Hsu <edward_hsu@realtek.com.tw> |
| Signed-off-by: Jeff Garzik <jgarzik@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/r8169.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/r8169.c |
| +++ b/drivers/net/r8169.c |
| @@ -2822,7 +2822,7 @@ static int rtl8169_rx_interrupt(struct n |
| pkt_size, PCI_DMA_FROMDEVICE); |
| rtl8169_mark_to_asic(desc, tp->rx_buf_sz); |
| } else { |
| - pci_unmap_single(pdev, addr, pkt_size, |
| + pci_unmap_single(pdev, addr, tp->rx_buf_sz, |
| PCI_DMA_FROMDEVICE); |
| tp->Rx_skbuff[entry] = NULL; |
| } |
