Merge branch 'linus' into x86/x2apic

[linux-2.6-omap-h63xx.git] / include / linux / netfilter / nf_conntrack_tcp.h

diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index 007af4c2770b70dd004ebe51403ae90fc93e9097..a049df4f2236360e2aae61bf3da3e38bf35b6963 100644 (file)
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -30,6 +30,14 @@ enum tcp_conntrack {
 /* Be liberal in window checking */
 #define IP_CT_TCP_FLAG_BE_LIBERAL              0x08
 
+/* Has unacknowledged data */
+#define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED     0x10
+
+struct nf_ct_tcp_flags {
+       u_int8_t flags;
+       u_int8_t mask;
+};
+
 #ifdef __KERNEL__
 
 struct ip_ct_tcp_state {