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

Commit 06611f82 authored by Julian Anastasov's avatar Julian Anastasov Committed by Pablo Neira Ayuso
Browse files

ipvs: remove check for IP_VS_CONN_F_SYNC from ip_vs_bind_dest 



	As the IP_VS_CONN_F_INACTIVE bit is properly set
in cp->flags for all kind of connections we do not need to
add special checks for synced connections when updating
the activeconns/inactconns counters for first time. Now
logic will look just like in ip_vs_unbind_dest.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 82cfc062

net/netfilter/ipvs/ip_vs_conn.c

+5 −5
Original line number Diff line number Diff line
@@ -585,11 +585,11 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest) 


	/* Update the connection counters */

	if (!(cp->flags & IP_VS_CONN_F_TEMPLATE)) {

		/* It is a normal connection, so increase the inactive

		   connection counter because it is in TCP SYNRECV

		   state (inactive) or other protocol inacive state */

		if ((cp->flags & IP_VS_CONN_F_SYNC) &&

		    (!(cp->flags & IP_VS_CONN_F_INACTIVE)))

		/* It is a normal connection, so modify the counters

		 * according to the flags, later the protocol can

		 * update them on state change

		 */

		if (!(cp->flags & IP_VS_CONN_F_INACTIVE))

			atomic_inc(&dest->activeconns);

		else

			atomic_inc(&dest->inactconns);