--- zzzz-none-000/linux-2.6.28.10/net/netfilter/nf_conntrack_proto_tcp.c 2009-05-02 18:54:43.000000000 +0000 +++ puma5-6360-529/linux-2.6.28.10/net/netfilter/nf_conntrack_proto_tcp.c 2009-12-14 14:57:12.000000000 +0000 @@ -71,7 +71,7 @@ static unsigned int nf_ct_tcp_timeout_max_retrans __read_mostly = 5 MINS; static unsigned int nf_ct_tcp_timeout_unacknowledged __read_mostly = 5 MINS; -static unsigned int tcp_timeouts[TCP_CONNTRACK_MAX] __read_mostly = { +unsigned int tcp_timeouts[TCP_CONNTRACK_MAX] __read_mostly = { [TCP_CONNTRACK_SYN_SENT] = 2 MINS, [TCP_CONNTRACK_SYN_RECV] = 60 SECS, [TCP_CONNTRACK_ESTABLISHED] = 5 DAYS, @@ -938,12 +938,13 @@ /* Keep compilers happy. */ break; } - +#if !defined(CONFIG_FUSIV_KERNEL_AP_2_AP) && !defined(CONFIG_FUSIV_KERNEL_AP_2_AP_MODULE) if (!tcp_in_window(ct, &ct->proto.tcp, dir, index, skb, dataoff, th, pf)) { write_unlock_bh(&tcp_lock); return -NF_ACCEPT; } +#endif in_window: /* From now on we have got in-window packets */ ct->proto.tcp.last_index = index; @@ -1439,3 +1440,4 @@ #endif }; EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_tcp6); +EXPORT_SYMBOL(tcp_timeouts);