diff options
author | Julian Anastasov <ja@ssi.bg> | 2012-04-24 16:46:36 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-05-08 13:38:26 -0400 |
commit | 06611f82cc0d8b957d6399f11f2799683ad002c3 (patch) | |
tree | ebefc1e883130f6470d9338d774ad5aebe6bf5fb | |
parent | 82cfc062781f29164b151de851f3076b84175fec (diff) |
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: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index f562e630d35a..1c1bb309a955 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c | |||
@@ -585,11 +585,11 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest) | |||
585 | 585 | ||
586 | /* Update the connection counters */ | 586 | /* Update the connection counters */ |
587 | if (!(cp->flags & IP_VS_CONN_F_TEMPLATE)) { | 587 | if (!(cp->flags & IP_VS_CONN_F_TEMPLATE)) { |
588 | /* It is a normal connection, so increase the inactive | 588 | /* It is a normal connection, so modify the counters |
589 | connection counter because it is in TCP SYNRECV | 589 | * according to the flags, later the protocol can |
590 | state (inactive) or other protocol inacive state */ | 590 | * update them on state change |
591 | if ((cp->flags & IP_VS_CONN_F_SYNC) && | 591 | */ |
592 | (!(cp->flags & IP_VS_CONN_F_INACTIVE))) | 592 | if (!(cp->flags & IP_VS_CONN_F_INACTIVE)) |
593 | atomic_inc(&dest->activeconns); | 593 | atomic_inc(&dest->activeconns); |
594 | else | 594 | else |
595 | atomic_inc(&dest->inactconns); | 595 | atomic_inc(&dest->inactconns); |