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_rr.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_rr.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_rr.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/ipv4/ipvs/ip_vs_rr.c b/net/ipv4/ipvs/ip_vs_rr.c index f7492911753..a22195f68ac 100644 --- a/net/ipv4/ipvs/ip_vs_rr.c +++ b/net/ipv4/ipvs/ip_vs_rr.c @@ -74,11 +74,11 @@ ip_vs_rr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) out: svc->sched_data = q; write_unlock(&svc->sched_lock); - IP_VS_DBG(6, "RR: server %u.%u.%u.%u:%u " - "activeconns %d refcnt %d weight %d\n", - NIPQUAD(dest->addr), ntohs(dest->port), - atomic_read(&dest->activeconns), - atomic_read(&dest->refcnt), atomic_read(&dest->weight)); + IP_VS_DBG_BUF(6, "RR: server %s:%u " + "activeconns %d refcnt %d weight %d\n", + IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port), + atomic_read(&dest->activeconns), + atomic_read(&dest->refcnt), atomic_read(&dest->weight)); return dest; } @@ -89,6 +89,9 @@ static struct ip_vs_scheduler ip_vs_rr_scheduler = { .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_rr_scheduler.n_list), +#ifdef CONFIG_IP_VS_IPV6 + .supports_ipv6 = 1, +#endif .init_service = ip_vs_rr_init_svc, .update_service = ip_vs_rr_update_svc, .schedule = ip_vs_rr_schedule, |