Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

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

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index fa5258f..c2dee7d 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           */
@@ -276,7 +268,7 @@ struct tcp_sock {
        u32     retrans_stamp;  /* Timestamp of the last retransmit,
                                 * also used in SYN-SENT to remember stamp of
                                 * the first SYN. */
-       u32     undo_marker;    /* tracking retrans started here. */
+       u32     undo_marker;    /* snd_una upon a new recovery episode. */
        int     undo_retrans;   /* number of undoable retransmissions. */
        u32     total_retrans;  /* Total retransmits for entire connection */