From 28b79ce03d717a0a273c2ab345d8308f2a426950 Mon Sep 17 00:00:00 2001
From: Maciej Sosnowski <maciej.sosnowski@intel.com>
Date: Tue, 22 Jul 2008 17:30:57 -0700
Subject: [PATCH] --- yaml --- r: 105076 b: refs/heads/master c:
 16a37acaaf4aaa631ba3f83710ed6cdb1a597520 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/dma/ioat_dma.c |  2 ++
 trunk/drivers/dma/ioatdma.h  | 15 +++++++++++++++
 trunk/net/core/user_dma.c    |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0915166dc26..c9e9ebeb8494 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09177e85d6a0bffac8b55afd28ed8b82bd873f0b
+refs/heads/master: 16a37acaaf4aaa631ba3f83710ed6cdb1a597520
diff --git a/trunk/drivers/dma/ioat_dma.c b/trunk/drivers/dma/ioat_dma.c
index da572968a7db..ece5a0e3a335 100644
--- a/trunk/drivers/dma/ioat_dma.c
+++ b/trunk/drivers/dma/ioat_dma.c
@@ -1581,6 +1581,8 @@ struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
 	if (err)
 		goto err_self_test;
 
+	ioat_set_tcp_copy_break(device);
+
 	dma_async_device_register(&device->common);
 
 	INIT_DELAYED_WORK(&device->work, ioat_dma_chan_watchdog);
diff --git a/trunk/drivers/dma/ioatdma.h b/trunk/drivers/dma/ioatdma.h
index c6ec933f9895..685adb62aa5a 100644
--- a/trunk/drivers/dma/ioatdma.h
+++ b/trunk/drivers/dma/ioatdma.h
@@ -27,6 +27,7 @@
 #include <linux/dmapool.h>
 #include <linux/cache.h>
 #include <linux/pci_ids.h>
+#include <net/tcp.h>
 
 #define IOAT_DMA_VERSION  "2.18"
 
@@ -129,6 +130,20 @@ struct ioat_desc_sw {
 	struct dma_async_tx_descriptor async_tx;
 };
 
+static inline void ioat_set_tcp_copy_break(struct ioatdma_device *dev)
+{
+	#ifdef CONFIG_NET_DMA
+	switch (dev->version) {
+	case IOAT_VER_1_2:
+		sysctl_tcp_dma_copybreak = 4096;
+		break;
+	case IOAT_VER_2_0:
+		sysctl_tcp_dma_copybreak = 2048;
+		break;
+	}
+	#endif
+}
+
 #if defined(CONFIG_INTEL_IOATDMA) || defined(CONFIG_INTEL_IOATDMA_MODULE)
 struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
 				      void __iomem *iobase);
diff --git a/trunk/net/core/user_dma.c b/trunk/net/core/user_dma.c
index 0ad1cd57bc39..de760504f6fe 100644
--- a/trunk/net/core/user_dma.c
+++ b/trunk/net/core/user_dma.c
@@ -34,6 +34,7 @@
 #define NET_DMA_DEFAULT_COPYBREAK 4096
 
 int sysctl_tcp_dma_copybreak = NET_DMA_DEFAULT_COPYBREAK;
+EXPORT_SYMBOL(sysctl_tcp_dma_copybreak);
 
 /**
  *	dma_skb_copy_datagram_iovec - Copy a datagram to an iovec.