* [patch net-next] ipvs: use pkts for SCTP too
[not found] ` <20100902020331.GS8174@verge.net.au>
@ 2010-09-02 8:19 ` Simon Horman
2010-09-02 17:05 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2010-09-02 8:19 UTC (permalink / raw)
To: lvs-devel, netdev
Cc: David S. Miller, Patrick McHardy, Wensong Zhang, Julian Anastasov
From: Julian Anastasov <ja@ssi.bg>
Use correctly the in_pkts packet counter also for SCTP
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
Dave, can you take this into net-next?
Index: net-next-2.6/net/netfilter/ipvs/ip_vs_core.c
===================================================================
--- net-next-2.6.orig/net/netfilter/ipvs/ip_vs_core.c 2010-09-02 10:59:53.000000000 +0900
+++ net-next-2.6/net/netfilter/ipvs/ip_vs_core.c 2010-09-02 11:02:11.000000000 +0900
@@ -1383,8 +1383,7 @@ ip_vs_in(unsigned int hooknum, struct sk
if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
cp->protocol == IPPROTO_SCTP) {
if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
- (atomic_read(&cp->in_pkts) %
- sysctl_ip_vs_sync_threshold[1]
+ (pkts % sysctl_ip_vs_sync_threshold[1]
== sysctl_ip_vs_sync_threshold[0])) ||
(cp->old_state != cp->state &&
((cp->state == IP_VS_SCTP_S_CLOSED) ||
@@ -1395,7 +1394,8 @@ ip_vs_in(unsigned int hooknum, struct sk
}
}
- if (af == AF_INET &&
+ /* Keep this block last: TCP and others with pp->num_states <= 1 */
+ else if (af == AF_INET &&
(ip_vs_sync_state & IP_VS_STATE_MASTER) &&
(((cp->protocol != IPPROTO_TCP ||
cp->state == IP_VS_TCP_S_ESTABLISHED) &&
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch net-next] ipvs: use pkts for SCTP too
2010-09-02 8:19 ` [patch net-next] ipvs: use pkts for SCTP too Simon Horman
@ 2010-09-02 17:05 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-02 17:05 UTC (permalink / raw)
To: horms; +Cc: lvs-devel, netdev, kaber, wensong, ja
From: Simon Horman <horms@verge.net.au>
Date: Thu, 2 Sep 2010 17:19:14 +0900
> From: Julian Anastasov <ja@ssi.bg>
>
> Use correctly the in_pkts packet counter also for SCTP
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Simon Horman <horms@verge.net.au>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-02 17:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <Pine.LNX.4.58.1009020242060.14271@u.domain.uli>
[not found] ` <20100902020331.GS8174@verge.net.au>
2010-09-02 8:19 ` [patch net-next] ipvs: use pkts for SCTP too Simon Horman
2010-09-02 17:05 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).