3 files changed, 1 insertions, 25 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 632082300e77..4f4f786255ef 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1349,8 +1349,6 @@ int ip_vs_protocol_init(void);
 void ip_vs_protocol_cleanup(void);
 void ip_vs_protocol_timeout_change(struct netns_ipvs *ipvs, int flags);
 int *ip_vs_create_timeout_table(int *table, int size);
-int ip_vs_set_state_timeout(int *table, int num, const char *const *names,
-                            const char *name, int to);
 void ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,
                                const struct sk_buff *skb, int offset,
                                const char *msg);
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index 8ae480715cea..ca880a3ad033 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -193,28 +193,6 @@ ip_vs_create_timeout_table(int *table, int size)
 }
 
 
-/*
- *      Set timeout value for state specified by name
- */
-int
-ip_vs_set_state_timeout(int *table, int num, const char *const *names,
-                        const char *name, int to)
-{
-        int i;
-
-        if (!table || !name || !to)
-                return -EINVAL;
-
-        for (i = 0; i < num; i++) {
-                if (strcmp(names[i], name))
-                        continue;
-                table[i] = to * HZ;
-                return 0;
-        }
-        return -ENOENT;
-}
-
-
 const char * ip_vs_state_name(__u16 proto, int state)
 {
         struct ip_vs_protocol *pp = ip_vs_proto_get(proto);
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 30d6b2cc00a0..0e5b64a75da0 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -520,7 +520,7 @@ static int ip_vs_sync_conn_needed(struct netns_ipvs *ipvs,
                 if (!(cp->flags & IP_VS_CONN_F_TEMPLATE) &&
                     pkts % sync_period != sysctl_sync_threshold(ipvs))
                         return 0;
-        } else if (sync_refresh_period <= 0 &&
+        } else if (!sync_refresh_period &&
                    pkts != sysctl_sync_threshold(ipvs))
                 return 0;