Commit d1908ca8 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

Merge tag 'ipvs3-for-v4.12' of http://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next

Simon Horman says:

====================
Third Round of IPVS Updates for v4.12

please consider these enhancements to IPVS for v4.12.
If it is too late for v4.12 then please consider them for v4.13.

* Remove unused function
* Correct comparison of unsigned value
====================
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 0e72f55f fb90e8de
...@@ -1349,8 +1349,6 @@ int ip_vs_protocol_init(void); ...@@ -1349,8 +1349,6 @@ int ip_vs_protocol_init(void);
void ip_vs_protocol_cleanup(void); void ip_vs_protocol_cleanup(void);
void ip_vs_protocol_timeout_change(struct netns_ipvs *ipvs, int flags); 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_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, void ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,
const struct sk_buff *skb, int offset, const struct sk_buff *skb, int offset,
const char *msg); const char *msg);
......
...@@ -193,28 +193,6 @@ ip_vs_create_timeout_table(int *table, int size) ...@@ -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) const char * ip_vs_state_name(__u16 proto, int state)
{ {
struct ip_vs_protocol *pp = ip_vs_proto_get(proto); struct ip_vs_protocol *pp = ip_vs_proto_get(proto);
......
...@@ -520,7 +520,7 @@ static int ip_vs_sync_conn_needed(struct netns_ipvs *ipvs, ...@@ -520,7 +520,7 @@ static int ip_vs_sync_conn_needed(struct netns_ipvs *ipvs,
if (!(cp->flags & IP_VS_CONN_F_TEMPLATE) && if (!(cp->flags & IP_VS_CONN_F_TEMPLATE) &&
pkts % sync_period != sysctl_sync_threshold(ipvs)) pkts % sync_period != sysctl_sync_threshold(ipvs))
return 0; return 0;
} else if (sync_refresh_period <= 0 && } else if (!sync_refresh_period &&
pkts != sysctl_sync_threshold(ipvs)) pkts != sysctl_sync_threshold(ipvs))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment