From 6983c863072cd0dc2831b9b4252a87983ea84661 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 17 Sep 2008 10:10:42 +1000 Subject: [PATCH] --- yaml --- r: 111669 b: refs/heads/master c: dff630ddad3884b99fae3ad92f5eccbf26618679 h: refs/heads/master i: 111667: 8fd722c2a125f0615629973ec54b1dc0328b0caf v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1686a9d2fd9f..1320369a25d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e691ed68d94ab3047e028736641445b4cf74d67 +refs/heads/master: dff630ddad3884b99fae3ad92f5eccbf26618679 diff --git a/trunk/net/ipv4/ipvs/ip_vs_core.c b/trunk/net/ipv4/ipvs/ip_vs_core.c index 80a4fcf33a54..ece748dbd0cd 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_core.c +++ b/trunk/net/ipv4/ipvs/ip_vs_core.c @@ -457,6 +457,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, if (sysctl_ip_vs_cache_bypass && svc->fwmark && unicast) { int ret, cs; struct ip_vs_conn *cp; + union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } }; ip_vs_service_put(svc); @@ -465,7 +466,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, cp = ip_vs_conn_new(svc->af, iph.protocol, &iph.saddr, pptr[0], &iph.daddr, pptr[1], - 0, 0, + &daddr, 0, IP_VS_CONN_F_BYPASS, NULL); if (cp == NULL)