From: Julius Volz Subject: [PATCH] IPVS: Remove incorrect ip_route_me_harder(), fix IPv6 Date: Mon, 8 Sep 2008 14:55:42 +0200 Message-ID: <1220878542-1864-1-git-send-email-juliusv@google.com> Return-path: DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1220878550; bh=abPG0nhqg0ZwtUVxW4VkDlE6mHs=; h=DomainKey-Signature:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=UnOU8O9KcgOjsp6z9JkeodFwUZs7mqqL5Eqm9U0nI50JxOAslvqsMjthrAzMloPNy RuhfU+bVIkj7TDo668WZw== Sender: netdev-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: netdev@vger.kernel.org, lvs-devel@vger.kernel.org Cc: horms@verge.net.au, siim@p6drad-teel.net, ja@ssi.bg, malcolm@loadbalancer.org, vbusam@google.com, herbert@gondor.apana.org.au, Julius Volz 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 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 f5180ac..bdc92d7 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); -- 1.5.4.5