aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorJulius Volz <juliusv@google.com>2008-09-08 08:55:42 -0400
committerSimon Horman <horms@verge.net.au>2008-09-08 19:43:13 -0400
commit9d7f2a2b1aa9e55537a053c68bdbd119fc479dd3 (patch)
tree412b0a94bdca4995f41643125f0cd8177a54c21b /net/ipv4
parent503e81f65adac596a0275ea0230f2ae1fd64c301 (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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ipvs/ip_vs_core.c9
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 f5180ac56be3..bdc92d73fbee 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,
904 if (ip_route_me_harder(skb, RTN_LOCAL) != 0) 904 if (ip_route_me_harder(skb, RTN_LOCAL) != 0)
905 goto drop; 905 goto drop;
906 906
907 /* For policy routing, packets originating from this
908 * machine itself may be routed differently to packets
909 * passing through. We want this packet to be routed as
910 * if it came from this machine itself. So re-compute
911 * the routing information.
912 */
913 if (ip_route_me_harder(skb, RTN_LOCAL) != 0)
914 goto drop;
915
916 IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT"); 907 IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT");
917 908
918 ip_vs_out_stats(cp, skb); 909 ip_vs_out_stats(cp, skb);