mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-16 03:26:53 +07:00
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: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
commit
d1908ca8dc
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user