diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-09 19:51:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-09 19:51:04 -0700 |
commit | dacc62dbf56e872ad96edde0393b9deb56d80cd5 (patch) | |
tree | 3d1b3e25aba9c5324bb0f6289033f502fa6ccb8c /net/ipv4/ipvs/ip_vs_wlc.c | |
parent | 47abf28d5b36521558a848a346064a3a3c82bd9e (diff) | |
parent | c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24 (diff) |
Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_wlc.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_wlc.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/ipv4/ipvs/ip_vs_wlc.c b/net/ipv4/ipvs/ip_vs_wlc.c index df7ad8d7476..8c596e71259 100644 --- a/net/ipv4/ipvs/ip_vs_wlc.c +++ b/net/ipv4/ipvs/ip_vs_wlc.c @@ -89,12 +89,12 @@ ip_vs_wlc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) } } - IP_VS_DBG(6, "WLC: server %u.%u.%u.%u:%u " - "activeconns %d refcnt %d weight %d overhead %d\n", - NIPQUAD(least->addr), ntohs(least->port), - atomic_read(&least->activeconns), - atomic_read(&least->refcnt), - atomic_read(&least->weight), loh); + IP_VS_DBG_BUF(6, "WLC: server %s:%u " + "activeconns %d refcnt %d weight %d overhead %d\n", + IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port), + atomic_read(&least->activeconns), + atomic_read(&least->refcnt), + atomic_read(&least->weight), loh); return least; } @@ -106,6 +106,9 @@ static struct ip_vs_scheduler ip_vs_wlc_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_wlc_scheduler.n_list), +#ifdef CONFIG_IP_VS_IPV6 + .supports_ipv6 = 1, +#endif .schedule = ip_vs_wlc_schedule, }; |