Missed any patches? [PATCH] expectation timeouts

[Phil Oester]

On Sat, Jun 11, 2005 at 06:46:47PM +0200, Patrick McHardy wrote:
> I've applied everything on the list I could find, if I missed
> anything please resend now. Thanks.

Here's one

Since expectation timeouts were made compulsory [1], there is no need to
check for them in ip_conntrack_expect_insert.

Phil

[1] https://lists.netfilter.org/pipermail/netfilter-devel/2005-January/018143.html


Signed-off-by: Phil Oester <kernel at linuxace.com>


-------------- next part --------------
diff -ruN linux-orig/net/ipv4/netfilter/ip_conntrack_core.c linux-new/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-orig/net/ipv4/netfilter/ip_conntrack_core.c	2005-03-02 02:37:30.000000000 -0500
+++ linux-new/net/ipv4/netfilter/ip_conntrack_core.c	2005-05-19 10:18:04.041146160 -0400
@@ -760,15 +760,11 @@
 	exp->master->expecting++;
 	list_add(&exp->list, &ip_conntrack_expect_list);
 
-	if (exp->master->helper->timeout) {
-		init_timer(&exp->timeout);
-		exp->timeout.data = (unsigned long)exp;
-		exp->timeout.function = expectation_timed_out;
-		exp->timeout.expires
-			= jiffies + exp->master->helper->timeout * HZ;
-		add_timer(&exp->timeout);
-	} else
-		exp->timeout.function = NULL;
+	init_timer(&exp->timeout);
+	exp->timeout.data = (unsigned long)exp;
+	exp->timeout.function = expectation_timed_out;
+	exp->timeout.expires = jiffies + exp->master->helper->timeout * HZ;
+	add_timer(&exp->timeout);
 
 	CONNTRACK_STAT_INC(expect_create);
 }