From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - r8169-balance-pci_map-pci_unmap-pair.patch removed from -mm tree Date: Thu, 28 Aug 2008 14:49:13 -0700 Message-ID: <200808282149.m7SLnD8b016172@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:37544 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756042AbYH1Vub (ORCPT ); Thu, 28 Aug 2008 17:50:31 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: romieu@fr.zoreil.com, alistair@devzero.co.uk, edward_hsu@realtek.com.tw, ilpo.jarvinen@helsinki.fi, jeff@garzik.org, stable@kernel.org, tjfontaine@atxconsulting.com, mm-commits@vger.kernel.org The patch titled r8169: balance pci_map / pci_unmap pair has been removed from the -mm tree. Its filename was r8169-balance-pci_map-pci_unmap-pair.patch This patch was dropped because it was merged into mainline or a subsyst= em tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mm= otm/ ------------------------------------------------------ Subject: r8169: balance pci_map / pci_unmap pair =46rom: Francois Romieu The leak hurts with swiotlb and jumbo frames (see http://bugzilla.kernel.org/show_bug.cgi?id=3D9468). Heavily hinted by Ilpo J=E4rvinen Signed-off-by: Francois Romieu Tested-by: Alistair John Strachan Tested-by: Timothy J Fontaine Cc: Edward Hsu Cc: Ilpo J=E4rvinen Cc: Jeff Garzik Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton --- 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 driv= ers/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] =3D NULL; } _ Patches currently in -mm which might be from romieu@fr.zoreil.com are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html