[IPV6]: ip6_output annotations

[safe/jmp/linux-2.6] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 542d395..2d36f6d 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -21,10 +21,10 @@
 #include <asm/byteorder.h>
 
 struct tcphdr {
-       __u16   source;
-       __u16   dest;
-       __u32   seq;
-       __u32   ack_seq;
+       __be16  source;
+       __be16  dest;
+       __be32  seq;
+       __be32  ack_seq;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u16   res1:4,
                doff:4,
@@ -50,9 +50,9 @@ struct tcphdr {
 #else
 #error "Adjust your <asm/byteorder.h> defines"
 #endif 
-       __u16   window;
-       __u16   check;
-       __u16   urg_ptr;
+       __be16  window;
+       __be16  check;
+       __be16  urg_ptr;
 };
 
 /*
@@ -62,7 +62,7 @@ struct tcphdr {
  */
 union tcp_word_hdr { 
        struct tcphdr hdr;
-       __u32             words[5];
+       __be32            words[5];
 }; 
 
 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
@@ -159,13 +159,18 @@ 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>
 
 /* This defines a selective acknowledgement block. */
+struct tcp_sack_block_wire {
+       __be32  start_seq;
+       __be32  end_seq;
+};
+
 struct tcp_sack_block {
        __u32   start_seq;
        __u32   end_seq;
@@ -211,7 +216,7 @@ struct tcp_sock {
  *     Header prediction flags
  *     0x5?10 << 16 + snd_wnd in net byte order
  */
-       __u32   pred_flags;
+       __be32  pred_flags;
 
 /*
  *     RFC793 variables by their proper names. This means you can
@@ -233,6 +238,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           */
@@ -330,6 +342,8 @@ struct tcp_sock {
 
        unsigned long last_synq_overflow; 
 
+       __u32   tso_deferred;
+
 /* Receiver side RTT estimation */
        struct {
                __u32   rtt;