Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / include / linux / tcp.h
index 4e14340..07e79bd 100644 (file)
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
+#include <linux/socket.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,25 +51,9 @@ struct tcphdr {
 #else
 #error "Adjust your <asm/byteorder.h> defines"
 #endif 
-       __u16   window;
-       __u16   check;
-       __u16   urg_ptr;
-};
-
-#define TCP_ACTION_FIN (1 << 7)
-
-enum {
-  TCPF_ESTABLISHED = (1 << 1),
-  TCPF_SYN_SENT  = (1 << 2),
-  TCPF_SYN_RECV  = (1 << 3),
-  TCPF_FIN_WAIT1 = (1 << 4),
-  TCPF_FIN_WAIT2 = (1 << 5),
-  TCPF_TIME_WAIT = (1 << 6),
-  TCPF_CLOSE     = (1 << 7),
-  TCPF_CLOSE_WAIT = (1 << 8),
-  TCPF_LAST_ACK  = (1 << 9),
-  TCPF_LISTEN    = (1 << 10),
-  TCPF_CLOSING   = (1 << 11) 
+       __be16  window;
+       __sum16 check;
+       __be16  urg_ptr;
 };
 
 /*
@@ -78,7 +63,7 @@ enum {
  */
 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]) 
@@ -110,6 +95,7 @@ enum {
 #define TCP_INFO               11      /* Information about this connection. */
 #define TCP_QUICKACK           12      /* Block/reenable quick acks */
 #define TCP_CONGESTION         13      /* Congestion control algorithm */
+#define TCP_MD5SIG             14      /* TCP MD5 Signature (RFC2385) */
 
 #define TCPI_OPT_TIMESTAMPS    1
 #define TCPI_OPT_SACK          2
@@ -173,27 +159,58 @@ struct tcp_info
        __u32   tcpi_total_retrans;
 };
 
+/* for TCP_MD5SIG socket option */
+#define TCP_MD5SIG_MAXKEYLEN   80
+
+struct tcp_md5sig {
+       struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
+       __u16   __tcpm_pad1;                            /* zero */
+       __u16   tcpm_keylen;                            /* key length */
+       __u32   __tcpm_pad2;                            /* zero */
+       __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
+};
+
 #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>
 
+static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
+{
+       return (struct tcphdr *)skb_transport_header(skb);
+}
+
+static inline unsigned int tcp_hdrlen(const struct sk_buff *skb)
+{
+       return tcp_hdr(skb)->doff * 4;
+}
+
+static inline unsigned int tcp_optlen(const struct sk_buff *skb)
+{
+       return (tcp_hdr(skb)->doff - 5) * 4;
+}
+
 /* 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;
+       u32     start_seq;
+       u32     end_seq;
 };
 
 struct tcp_options_received {
 /*     PAWS/RTTM data  */
        long    ts_recent_stamp;/* Time we stored ts_recent (for aging) */
-       __u32   ts_recent;      /* Time stamp to echo next              */
-       __u32   rcv_tsval;      /* Time stamp value                     */
-       __u32   rcv_tsecr;      /* Time stamp echo reply                */
-       __u16   saw_tstamp : 1, /* Saw TIMESTAMP on last packet         */
+       u32     ts_recent;      /* Time stamp to echo next              */
+       u32     rcv_tsval;      /* Time stamp value                     */
+       u32     rcv_tsecr;      /* Time stamp echo reply                */
+       u16     saw_tstamp : 1, /* Saw TIMESTAMP on last packet         */
                tstamp_ok : 1,  /* TIMESTAMP seen on SYN packet         */
                dsack : 1,      /* D-SACK is scheduled                  */
                wscale_ok : 1,  /* Wscale seen on SYN packet            */
@@ -201,16 +218,20 @@ struct tcp_options_received {
                snd_wscale : 4, /* Window scaling received from sender  */
                rcv_wscale : 4; /* Window scaling to send to receiver   */
 /*     SACKs data      */
-       __u8    eff_sacks;      /* Size of SACK array to send with next packet */
-       __u8    num_sacks;      /* Number of SACK blocks                */
-       __u16   user_mss;       /* mss requested by user in ioctl */
-       __u16   mss_clamp;      /* Maximal mss, negotiated at connection setup */
+       u8      eff_sacks;      /* Size of SACK array to send with next packet */
+       u8      num_sacks;      /* Number of SACK blocks                */
+       u16     user_mss;       /* mss requested by user in ioctl */
+       u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
 };
 
 struct tcp_request_sock {
-       struct inet_request_sock req;
-       __u32                    rcv_isn;
-       __u32                    snt_isn;
+       struct inet_request_sock        req;
+#ifdef CONFIG_TCP_MD5SIG
+       /* Only used by TCP MD5 Signature so far. */
+       struct tcp_request_sock_ops     *af_specific;
+#endif
+       u32                             rcv_isn;
+       u32                             snt_isn;
 };
 
 static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -221,26 +242,29 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
 struct tcp_sock {
        /* inet_connection_sock has to be the first member of tcp_sock */
        struct inet_connection_sock     inet_conn;
-       int     tcp_header_len; /* Bytes of tcp header to send          */
+       u16     tcp_header_len; /* Bytes of tcp header to send          */
+       u16     xmit_size_goal; /* Goal for segmenting output packets   */
 
 /*
  *     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
  *     read the code and the spec side by side (and laugh ...)
  *     See RFC793 and RFC1122. The RFC writes these in capitals.
  */
-       __u32   rcv_nxt;        /* What we want to receive next         */
-       __u32   snd_nxt;        /* Next sequence we send                */
+       u32     rcv_nxt;        /* What we want to receive next         */
+       u32     copied_seq;     /* Head of yet unread data              */
+       u32     rcv_wup;        /* rcv_nxt on last window update sent   */
+       u32     snd_nxt;        /* Next sequence we send                */
 
-       __u32   snd_una;        /* First byte we want an ack for        */
-       __u32   snd_sml;        /* Last byte of the most recently transmitted small packet */
-       __u32   rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
-       __u32   lsndtime;       /* timestamp of last sent data packet (for restart window) */
+       u32     snd_una;        /* First byte we want an ack for        */
+       u32     snd_sml;        /* Last byte of the most recently transmitted small packet */
+       u32     rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
+       u32     lsndtime;       /* timestamp of last sent data packet (for restart window) */
 
        /* Data for direct copy to user */
        struct {
@@ -249,35 +273,41 @@ 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           */
-       __u32   snd_wnd;        /* The window we expect to receive      */
-       __u32   max_window;     /* Maximal window ever seen from peer   */
-       __u32   pmtu_cookie;    /* Last pmtu seen by socket             */
-       __u32   mss_cache;      /* Cached effective mss, not including SACKS */
-       __u16   xmit_size_goal; /* Goal for segmenting output packets   */
-       __u16   ext_header_len; /* Network protocol overhead (IP/IPv6 options) */
+       u32     snd_wl1;        /* Sequence for window update           */
+       u32     snd_wnd;        /* The window we expect to receive      */
+       u32     max_window;     /* Maximal window ever seen from peer   */
+       u32     mss_cache;      /* Cached effective mss, not including SACKS */
 
-       __u32   window_clamp;   /* Maximal window to advertise          */
-       __u32   rcv_ssthresh;   /* Current window clamp                 */
+       u32     window_clamp;   /* Maximal window to advertise          */
+       u32     rcv_ssthresh;   /* Current window clamp                 */
 
-       __u32   frto_highmark;  /* snd_nxt when RTO occurred */
-       __u8    reordering;     /* Packet reordering metric.            */
-       __u8    frto_counter;   /* Number of new acks after RTO */
-       __u8    nonagle;        /* Disable Nagle algorithm?             */
-       __u8    keepalive_probes; /* num of allowed keep alive probes   */
+       u32     frto_highmark;  /* snd_nxt when RTO occurred */
+       u16     advmss;         /* Advertised MSS                       */
+       u8      frto_counter;   /* Number of new acks after RTO */
+       u8      nonagle;        /* Disable Nagle algorithm?             */
 
 /* RTT measurement */
-       __u32   srtt;           /* smoothed round trip time << 3        */
-       __u32   mdev;           /* medium deviation                     */
-       __u32   mdev_max;       /* maximal mdev for the last rtt period */
-       __u32   rttvar;         /* smoothed mdev_max                    */
-       __u32   rtt_seq;        /* sequence number to update rttvar     */
-
-       __u32   packets_out;    /* Packets which are "in flight"        */
-       __u32   left_out;       /* Packets which leaved network */
-       __u32   retrans_out;    /* Retransmitted packets out            */
+       u32     srtt;           /* smoothed round trip time << 3        */
+       u32     mdev;           /* medium deviation                     */
+       u32     mdev_max;       /* maximal mdev for the last rtt period */
+       u32     rttvar;         /* smoothed mdev_max                    */
+       u32     rtt_seq;        /* sequence number to update rttvar     */
+
+       u32     packets_out;    /* Packets which are "in flight"        */
+       u32     retrans_out;    /* Retransmitted packets out            */
+
+       u16     urg_data;       /* Saved octet of OOB data and control flags */
+       u8      urg_mode;       /* In urgent mode               */
+       u8      ecn_flags;      /* ECN status bits.                     */
 /*
  *      Options received (usually on last packet, some only on SYN packets).
  */
@@ -286,80 +316,95 @@ struct tcp_sock {
 /*
  *     Slow start and congestion control (see also Nagle, and Karn & Partridge)
  */
-       __u32   snd_ssthresh;   /* Slow start size threshold            */
-       __u32   snd_cwnd;       /* Sending congestion window            */
-       __u16   snd_cwnd_cnt;   /* Linear increase counter              */
-       __u16   snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
-       __u32   snd_cwnd_used;
-       __u32   snd_cwnd_stamp;
+       u32     snd_ssthresh;   /* Slow start size threshold            */
+       u32     snd_cwnd;       /* Sending congestion window            */
+       u32     snd_cwnd_cnt;   /* Linear increase counter              */
+       u32     snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
+       u32     snd_cwnd_used;
+       u32     snd_cwnd_stamp;
+
+       u32     rcv_wnd;        /* Current receiver window              */
+       u32     write_seq;      /* Tail(+1) of data held in tcp send buffer */
+       u32     pushed_seq;     /* Last pushed seq, required to talk to windows */
+       u32     lost_out;       /* Lost packets                 */
+       u32     sacked_out;     /* SACK'd packets                       */
+       u32     fackets_out;    /* FACK'd packets                       */
+       u32     tso_deferred;
+       u32     bytes_acked;    /* Appropriate Byte Counting - RFC3465 */
 
-       struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
+       /* from STCP, retrans queue hinting */
+       struct sk_buff* lost_skb_hint;
+       struct sk_buff *scoreboard_skb_hint;
+       struct sk_buff *retransmit_skb_hint;
+       struct sk_buff *forward_skb_hint;
 
-       __u32   rcv_wnd;        /* Current receiver window              */
-       __u32   rcv_wup;        /* rcv_nxt on last window update sent   */
-       __u32   write_seq;      /* Tail(+1) of data held in tcp send buffer */
-       __u32   pushed_seq;     /* Last pushed seq, required to talk to windows */
-       __u32   copied_seq;     /* Head of yet unread data              */
+       struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
 
-/*     SACKs data      */
+       /* SACKs data, these 2 need to be together (see tcp_build_and_update_options) */
        struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
        struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/
 
        struct tcp_sack_block recv_sack_cache[4];
 
-       /* from STCP, retrans queue hinting */
-       struct sk_buff* lost_skb_hint;
-
-       struct sk_buff *scoreboard_skb_hint;
-       struct sk_buff *retransmit_skb_hint;
-       struct sk_buff *forward_skb_hint;
-       struct sk_buff *fastpath_skb_hint;
+       struct sk_buff *highest_sack;   /* highest skb with SACK received
+                                        * (validity guaranteed only if
+                                        * sacked_out > 0)
+                                        */
 
-       int     fastpath_cnt_hint;
        int     lost_cnt_hint;
        int     retransmit_cnt_hint;
-       int     forward_cnt_hint;
 
-       __u16   advmss;         /* Advertised MSS                       */
-       __u16   prior_ssthresh; /* ssthresh saved at recovery start     */
-       __u32   lost_out;       /* Lost packets                 */
-       __u32   sacked_out;     /* SACK'd packets                       */
-       __u32   fackets_out;    /* FACK'd packets                       */
-       __u32   high_seq;       /* snd_nxt at onset of congestion       */
+       u32     lost_retrans_low;       /* Sent seq after any rxmit (lowest) */
 
-       __u32   retrans_stamp;  /* Timestamp of the last retransmit,
+       u8      reordering;     /* Packet reordering metric.            */
+       u8      keepalive_probes; /* num of allowed keep alive probes   */
+       u32     prior_ssthresh; /* ssthresh saved at recovery start     */
+       u32     high_seq;       /* snd_nxt at onset of congestion       */
+
+       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;    /* tracking retrans started here. */
        int     undo_retrans;   /* number of undoable retransmissions. */
-       __u32   urg_seq;        /* Seq of received urgent pointer */
-       __u16   urg_data;       /* Saved octet of OOB data and control flags */
-       __u8    urg_mode;       /* In urgent mode               */
-       __u8    ecn_flags;      /* ECN status bits.                     */
-       __u32   snd_up;         /* Urgent pointer               */
+       u32     total_retrans;  /* Total retransmits for entire connection */
 
-       __u32   total_retrans;  /* Total retransmits for entire connection */
-       __u32   bytes_acked;    /* Appropriate Byte Counting - RFC3465 */
+       u32     urg_seq;        /* Seq of received urgent pointer */
+       u32     snd_up;         /* Urgent pointer               */
 
        unsigned int            keepalive_time;   /* time before keep alive takes place */
        unsigned int            keepalive_intvl;  /* time interval between keep alive probes */
-       int                     linger2;
 
        unsigned long last_synq_overflow; 
 
 /* Receiver side RTT estimation */
        struct {
-               __u32   rtt;
-               __u32   seq;
-               __u32   time;
+               u32     rtt;
+               u32     seq;
+               u32     time;
        } rcv_rtt_est;
 
 /* Receiver queue space */
        struct {
                int     space;
-               __u32   seq;
-               __u32   time;
+               u32     seq;
+               u32     time;
        } rcvq_space;
+
+/* TCP-specific MTU probe information. */
+       struct {
+               u32               probe_seq_start;
+               u32               probe_seq_end;
+       } mtu_probe;
+
+#ifdef CONFIG_TCP_MD5SIG
+/* TCP AF-Specific parts; only used by MD5 Signature support so far */
+       struct tcp_sock_af_ops  *af_specific;
+
+/* TCP MD5 Signagure Option information */
+       struct tcp_md5sig_info  *md5sig_info;
+#endif
+
+       int                     linger2;
 };
 
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)
@@ -369,11 +414,15 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
 
 struct tcp_timewait_sock {
        struct inet_timewait_sock tw_sk;
-       __u32                     tw_rcv_nxt;
-       __u32                     tw_snd_nxt;
-       __u32                     tw_rcv_wnd;
-       __u32                     tw_ts_recent;
+       u32                       tw_rcv_nxt;
+       u32                       tw_snd_nxt;
+       u32                       tw_rcv_wnd;
+       u32                       tw_ts_recent;
        long                      tw_ts_recent_stamp;
+#ifdef CONFIG_TCP_MD5SIG
+       u16                       tw_md5_keylen;
+       u8                        tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
+#endif
 };
 
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)