Commit:     5c81833c2f74304142be6dde5688bf444316da21
Parent:     ad02ac145d49067a94bf8f3357c527020d5893ed
Author:     Andy Gospodarek <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 29 04:35:45 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Oct 29 22:37:23 2007 -0700

    [IPVS]: use proper timeout instead of fixed value
    Instead of using the default timeout of 3 minutes, this uses the timeout
    specific to the protocol used for the connection. The 3 minute timeout
    seems somewhat arbitrary (though I know it is used other places in the
    ipvs code) and when failing over it would be much nicer to use one of
    the configured timeout values.
    Signed-off-by: Andy Gospodarek <[EMAIL PROTECTED]>
    Acked-by: Simon Horman <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/ipvs/ip_vs_sync.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index c99f2a3..0d4d972 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -72,7 +72,6 @@ struct ip_vs_sync_thread_data {
        int state;
-#define IP_VS_SYNC_CONN_TIMEOUT (3*60*HZ)
 #define SIMPLE_CONN_SIZE  (sizeof(struct ip_vs_sync_conn))
 #define FULL_CONN_SIZE  \
 (sizeof(struct ip_vs_sync_conn) + sizeof(struct ip_vs_sync_conn_options))
@@ -284,6 +283,7 @@ static void ip_vs_process_message(const char *buffer, const 
size_t buflen)
        struct ip_vs_sync_conn *s;
        struct ip_vs_sync_conn_options *opt;
        struct ip_vs_conn *cp;
+       struct ip_vs_protocol *pp;
        char *p;
        int i;
@@ -342,7 +342,8 @@ static void ip_vs_process_message(const char *buffer, const 
size_t buflen)
                        p += SIMPLE_CONN_SIZE;
                atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
-               cp->timeout = IP_VS_SYNC_CONN_TIMEOUT;
+               pp = ip_vs_proto_get(s->protocol);
+               cp->timeout = pp->timeout_table[cp->state];
                if (p > buffer+buflen) {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to