Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[deliverable/linux.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index fa5258f322e7998664a257e2d17f8397cd4346b2..ac82c5ea955bd160e0bde9057ca3885dfc16ad87 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -19,7 +19,6 @@
 
 
 #include <linux/skbuff.h>
-#include <linux/dmaengine.h>
 #include <net/sock.h>
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
@@ -166,13 +165,6 @@ 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           */