The patch titled r8169: balance pci_map / pci_unmap pair has been added to the -mm tree. Its filename is r8169-balance-pci_map-pci_unmap-pair.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: r8169: balance pci_map / pci_unmap pair From: Francois Romieu <romieu@xxxxxxxxxxxxx> The leak hurts with swiotlb and jumbo frames (see http://bugzilla.kernel.org/show_bug.cgi?id=9468). Heavily hinted by Ilpo Järvinen Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx> Tested-by: Alistair John Strachan <alistair@xxxxxxxxxxxxx> Tested-by: Timothy J Fontaine <tjfontaine@xxxxxxxxxxxxxxxxx> Cc: Edward Hsu <edward_hsu@xxxxxxxxxxxxxx> Cc: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/r8169.c~r8169-balance-pci_map-pci_unmap-pair drivers/net/r8169.c --- a/drivers/net/r8169.c~r8169-balance-pci_map-pci_unmap-pair +++ a/drivers/net/r8169.c @@ -2792,7 +2792,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; } _ Patches currently in -mm which might be from romieu@xxxxxxxxxxxxx are r8169-balance-pci_map-pci_unmap-pair.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html