linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8ebf497..f2bb239 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -159,8 +159,8 @@ struct tcp_info
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <linux/skbuff.h>
-#include <linux/dmaengine.h>
 #include <net/sock.h>
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
@@ -233,13 +233,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           */
@@ -350,12 +343,6 @@ struct tcp_sock {
                __u32   seq;
                __u32   time;
        } rcvq_space;
-
-/* TCP-specific MTU probe information. */
-       struct {
-               __u32             probe_seq_start;
-               __u32             probe_seq_end;
-       } mtu_probe;
 };
 
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)