mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
ipvs: Pass destination address family to ip_vs_trash_get_dest
Part of a series of diffs to tease out destination family from virtual family. This diff just adds a parameter to ip_vs_trash_get and then uses it for comparison rather than svc->af. Signed-off-by: Alex Gartrell <agartrell@fb.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
parent
655eef103d
commit
ad147aa4dd
1 changed files with 6 additions and 6 deletions
|
@ -657,8 +657,8 @@ static void __ip_vs_dst_cache_reset(struct ip_vs_dest *dest)
|
|||
* scheduling.
|
||||
*/
|
||||
static struct ip_vs_dest *
|
||||
ip_vs_trash_get_dest(struct ip_vs_service *svc, const union nf_inet_addr *daddr,
|
||||
__be16 dport)
|
||||
ip_vs_trash_get_dest(struct ip_vs_service *svc, int dest_af,
|
||||
const union nf_inet_addr *daddr, __be16 dport)
|
||||
{
|
||||
struct ip_vs_dest *dest;
|
||||
struct netns_ipvs *ipvs = net_ipvs(svc->net);
|
||||
|
@ -671,11 +671,11 @@ ip_vs_trash_get_dest(struct ip_vs_service *svc, const union nf_inet_addr *daddr,
|
|||
IP_VS_DBG_BUF(3, "Destination %u/%s:%u still in trash, "
|
||||
"dest->refcnt=%d\n",
|
||||
dest->vfwmark,
|
||||
IP_VS_DBG_ADDR(svc->af, &dest->addr),
|
||||
IP_VS_DBG_ADDR(dest->af, &dest->addr),
|
||||
ntohs(dest->port),
|
||||
atomic_read(&dest->refcnt));
|
||||
if (dest->af == svc->af &&
|
||||
ip_vs_addr_equal(svc->af, &dest->addr, daddr) &&
|
||||
if (dest->af == dest_af &&
|
||||
ip_vs_addr_equal(dest_af, &dest->addr, daddr) &&
|
||||
dest->port == dport &&
|
||||
dest->vfwmark == svc->fwmark &&
|
||||
dest->protocol == svc->protocol &&
|
||||
|
@ -950,7 +950,7 @@ ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)
|
|||
* Check if the dest already exists in the trash and
|
||||
* is from the same service
|
||||
*/
|
||||
dest = ip_vs_trash_get_dest(svc, &daddr, dport);
|
||||
dest = ip_vs_trash_get_dest(svc, udest->af, &daddr, dport);
|
||||
|
||||
if (dest != NULL) {
|
||||
IP_VS_DBG_BUF(3, "Get destination %s:%u from trash, "
|
||||
|
|
Loading…
Reference in a new issue