From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Oct 2010 19:30:34 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d122179a3c0fdc71b88cb9e3605f372b1651a9ff;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	net/core/ethtool.c
---

d122179a3c0fdc71b88cb9e3605f372b1651a9ff
diff --cc drivers/net/r8169.c
index fe3b7622fba0,992db2fa136e..bc669a40ae96
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@@ -4551,8 -4551,10 +4556,8 @@@ static int rtl8169_rx_interrupt(struct 
  				continue;
  			}
  
 -			rtl8169_rx_csum(skb, desc);
 -
  			if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) {
- 				pci_dma_sync_single_for_device(pdev, addr,
+ 				dma_sync_single_for_device(&pdev->dev, addr,
  					pkt_size, PCI_DMA_FROMDEVICE);
  				rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
  			} else {