diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
| commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
| tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /include | |
| parent | bnx2: Update version to 2.0.3. (diff) | |
| parent | netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line (diff) | |
| download | linux-dev-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.xz linux-dev-424eff975192553a9ea8bfd51bf65039ffb356ef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_tcp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h index f6d97f64d7a0..6e135f97e59a 100644 --- a/include/linux/netfilter/nf_conntrack_tcp.h +++ b/include/linux/netfilter/nf_conntrack_tcp.h @@ -66,6 +66,9 @@ struct ip_ct_tcp { u_int32_t last_ack; /* Last sequence number seen in opposite dir */ u_int32_t last_end; /* Last seq + len */ u_int16_t last_win; /* Last window advertisement seen in dir */ + /* For SYN packets while we may be out-of-sync */ + u_int8_t last_wscale; /* Last window scaling factor seen */ + u_int8_t last_flags; /* Last flags set */ }; #endif /* __KERNEL__ */ |