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_sh.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_sh.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_sh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/ip_vs_sh.c b/net/ipv4/ipvs/ip_vs_sh.c index 7b979e22805..1d96de27fef 100644 --- a/net/ipv4/ipvs/ip_vs_sh.c +++ b/net/ipv4/ipvs/ip_vs_sh.c @@ -215,7 +215,7 @@ ip_vs_sh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) IP_VS_DBG(6, "SH: source IP address %u.%u.%u.%u " "--> server %u.%u.%u.%u:%d\n", NIPQUAD(iph->saddr), - NIPQUAD(dest->addr), + NIPQUAD(dest->addr.ip), ntohs(dest->port)); return dest; @@ -231,6 +231,9 @@ static struct ip_vs_scheduler ip_vs_sh_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_sh_scheduler.n_list), +#ifdef CONFIG_IP_VS_IPV6 + .supports_ipv6 = 0, +#endif .init_service = ip_vs_sh_init_svc, .done_service = ip_vs_sh_done_svc, .update_service = ip_vs_sh_update_svc, |