[PATCH] ipvs: fix timer in get_curr_sync_buff

To: Simon Horman <horms@xxxxxxxxxxxx>
Subject: [PATCH] ipvs: fix timer in get_curr_sync_buff
Cc: lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, Tinggong Wang <wangtinggong@xxxxxxxxx>
From: Julian Anastasov <ja@xxxxxx>
Date: Wed, 9 Feb 2011 02:21:59 +0200 (EET)

From: Tinggong Wang <wangtinggong@xxxxxxxxx>

        Fix get_curr_sync_buff to keep buffer for 2 seconds
as intended, not just for the current jiffie. By this way
we will sync more connection structures with single packet.

Signed-off-by: Tinggong Wang <wangtinggong@xxxxxxxxx>
Signed-off-by: Julian Anastasov <ja@xxxxxx>

        Patch is against lvs-test-2.6 from 09-FEB-2011
but should apply cleanly to net-next.

--- lvs-test-2.6-7c9989a/net/netfilter/ipvs/ip_vs_sync.c        2011-02-07 
13:40:00.000000000 +0200
+++ linux/net/netfilter/ipvs/ip_vs_sync.c       2011-02-09 01:59:46.771351460 
@@ -374,8 +374,8 @@ get_curr_sync_buff(struct netns_ipvs *ip
        struct ip_vs_sync_buff *sb;

-       if (ipvs->sync_buff && (time == 0 ||
-           time_before(jiffies - ipvs->sync_buff->firstuse, time))) {
+       if (ipvs->sync_buff &&
+           time_after_eq(jiffies - ipvs->sync_buff->firstuse, time)) {
                sb = ipvs->sync_buff;
                ipvs->sync_buff = NULL;
        } else
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at

<Prev in Thread] Current Thread [Next in Thread>