diff options
| author | Julius Volz <juliusv@google.com> | 2008-09-08 14:55:42 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-09 09:43:13 +1000 |
| commit | 9d7f2a2b1aa9e55537a053c68bdbd119fc479dd3 (patch) | |
| tree | 412b0a94bdca4995f41643125f0cd8177a54c21b | |
| parent | 503e81f65adac596a0275ea0230f2ae1fd64c301 (diff) | |
IPVS: Remove incorrect ip_route_me_harder(), fix IPv6
Remove an incorrect ip_route_me_harder() that was probably a result of
merging my IPv6 patches with the local client patches. With this, IPv6+NAT
are working again.
Signed-off-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_core.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c index f5180ac56be..bdc92d73fbe 100644 --- a/net/ipv4/ipvs/ip_vs_core.c +++ b/net/ipv4/ipvs/ip_vs_core.c @@ -904,15 +904,6 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_protocol *pp, if (ip_route_me_harder(skb, RTN_LOCAL) != 0) goto drop; - /* For policy routing, packets originating from this - * machine itself may be routed differently to packets - * passing through. We want this packet to be routed as - * if it came from this machine itself. So re-compute - * the routing information. - */ - if (ip_route_me_harder(skb, RTN_LOCAL) != 0) - goto drop; - IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT"); ip_vs_out_stats(cp, skb); |