diff options
| author | Julius Volz <juliusv@google.com> | 2008-09-02 15:55:39 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-05 11:17:06 +1000 |
| commit | b14198f6c1bea1687d20723db35d8effecd9d899 (patch) | |
| tree | f521aa6fdaa6a70aa2240c6ac59321722a04a1c3 /net/ipv4/ipvs/ip_vs_sed.c | |
| parent | 3c2e0505d25cdc9425336f167fd4ff5f505aecff (diff) | |
| download | blackbird-op-linux-b14198f6c1bea1687d20723db35d8effecd9d899.tar.gz blackbird-op-linux-b14198f6c1bea1687d20723db35d8effecd9d899.zip | |
IPVS: Add IPv6 support flag to schedulers
Add 'supports_ipv6' flag to struct ip_vs_scheduler to indicate whether a
scheduler supports IPv6. Set the flag to 1 in schedulers that work with
IPv6, 0 otherwise. This flag is checked in a later patch while trying to
add a service with a specific scheduler. Adjust debug in v6-supporting
schedulers to work with both address families.
Signed-off-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_sed.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_sed.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/ipv4/ipvs/ip_vs_sed.c b/net/ipv4/ipvs/ip_vs_sed.c index 38b574b2fdf0..7d2f22f04b83 100644 --- a/net/ipv4/ipvs/ip_vs_sed.c +++ b/net/ipv4/ipvs/ip_vs_sed.c @@ -101,12 +101,12 @@ ip_vs_sed_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) } } - IP_VS_DBG(6, "SED: server %u.%u.%u.%u:%u " - "activeconns %d refcnt %d weight %d overhead %d\n", - NIPQUAD(least->addr.ip), ntohs(least->port), - atomic_read(&least->activeconns), - atomic_read(&least->refcnt), - atomic_read(&least->weight), loh); + IP_VS_DBG_BUF(6, "SED: 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; } @@ -118,6 +118,9 @@ static struct ip_vs_scheduler ip_vs_sed_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_sed_scheduler.n_list), +#ifdef CONFIG_IP_VS_IPV6 + .supports_ipv6 = 1, +#endif .schedule = ip_vs_sed_schedule, }; |
