Merge git://oss.sgi.com:8090/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 542d39596bd86f0c7cdc84b58977b4da440590a2..420a689c3fb45c5f088837424f0b3a705a640082 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -18,6 +18,7 @@
 #define _LINUX_TCP_H
 
 #include <linux/types.h>
+#include <linux/dmaengine.h>
 #include <asm/byteorder.h>
 
 struct tcphdr {
@@ -159,7 +160,6 @@ struct tcp_info
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/inet_connection_sock.h>
@@ -233,6 +233,13 @@ struct tcp_sock {
                struct iovec            *iov;
                int                     memory;
                int                     len;
+#ifdef CONFIG_NET_DMA
+               /* members for async copy */
+               struct dma_chan         *dma_chan;
+               int                     wakeup;
+               struct dma_pinned_list  *pinned_list;
+               dma_cookie_t            dma_cookie;
+#endif
        } ucopy;
 
        __u32   snd_wl1;        /* Sequence for window update           */