Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3cdb41 authored by Phil Oester's avatar Phil Oester Committed by David S. Miller
Browse files

[NETFILTER]: expectation timeouts are compulsory 

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

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



Signed-off-by: default avatarPhil Oester <kernel@linuxace.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9823185

net/ipv4/netfilter/ip_conntrack_core.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -760,15 +760,11 @@ static void ip_conntrack_expect_insert(struct ip_conntrack_expect *exp) 
	exp->master->expecting++;

	exp->master->expecting++;

	list_add(&exp->list, &ip_conntrack_expect_list);

	list_add(&exp->list, &ip_conntrack_expect_list);





	if (exp->master->helper->timeout) {

	init_timer(&exp->timeout);

	init_timer(&exp->timeout);

	exp->timeout.data = (unsigned long)exp;

	exp->timeout.data = (unsigned long)exp;

	exp->timeout.function = expectation_timed_out;

	exp->timeout.function = expectation_timed_out;

		exp->timeout.expires

	exp->timeout.expires = jiffies + exp->master->helper->timeout * HZ;

			= jiffies + exp->master->helper->timeout * HZ;

	add_timer(&exp->timeout);

	add_timer(&exp->timeout);

	} else

		exp->timeout.function = NULL;





	CONNTRACK_STAT_INC(expect_create);

	CONNTRACK_STAT_INC(expect_create);

}

}