diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-28 00:51:25 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-28 00:51:25 +0200 |
commit | 4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0 (patch) | |
tree | b9eabfb61d9b74d87e75c073c79edc92d9612ed8 /include | |
parent | bfin_mac: fix build error due to net_device_ops convert (diff) | |
parent | netfilter: nfnetlink_log: fix wrong skbuff size calculation (diff) | |
download | linux-4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0.tar.xz linux-4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter/nf_conntrack_tcp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h index 3066789b972a..b2f384d42611 100644 --- a/include/linux/netfilter/nf_conntrack_tcp.h +++ b/include/linux/netfilter/nf_conntrack_tcp.h @@ -35,6 +35,9 @@ enum tcp_conntrack { /* Has unacknowledged data */ #define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED 0x10 +/* The field td_maxack has been set */ +#define IP_CT_TCP_FLAG_MAXACK_SET 0x20 + struct nf_ct_tcp_flags { __u8 flags; __u8 mask; @@ -46,6 +49,7 @@ struct ip_ct_tcp_state { u_int32_t td_end; /* max of seq + len */ u_int32_t td_maxend; /* max of ack + max(win, 1) */ u_int32_t td_maxwin; /* max(win) */ + u_int32_t td_maxack; /* max of ack */ u_int8_t td_scale; /* window scale factor */ u_int8_t flags; /* per direction options */ }; |