X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Ftcp.h;fp=include%2Flinux%2Ftcp.h;h=f2bb2396853f5319000e70bcb9bf71784e933c18;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=8ebf497907f8ec8cb8e014b8ff2f5f840261a3f5;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8ebf49790..f2bb23968 100644
--- 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)