From patchwork Wed Nov 30 16:10:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Graf X-Patchwork-Id: 701061 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tTQPM2GXWz9t2G for ; Thu, 1 Dec 2016 03:10:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758132AbcK3QKY (ORCPT ); Wed, 30 Nov 2016 11:10:24 -0500 Received: from merlin.infradead.org ([205.233.59.134]:45398 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758110AbcK3QKT (ORCPT ); Wed, 30 Nov 2016 11:10:19 -0500 Received: from 84-73-231-184.dclient.hispeed.ch ([84.73.231.184] helo=lsx.localdomain) by merlin.infradead.org with esmtpsa (Exim 4.85_2 #1 (Red Hat Linux)) id 1cC7Sb-0003R7-3B; Wed, 30 Nov 2016 16:10:17 +0000 From: Thomas Graf To: davem@davemloft.net Cc: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, daniel@iogearbox.net, tom@herbertland.com, roopa@cumulusnetworks.com, hannes@stressinduktion.org Subject: [PATCH net-next v4 1/4] route: Set orig_output when redirecting to lwt on locally generated traffic Date: Wed, 30 Nov 2016 17:10:08 +0100 Message-Id: <231e48734bb95fab30fb6c879ab858120cfb88ff.1480522144.git.tgraf@suug.ch> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-SRS-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org. See http://www.infradead.org/rpr.html Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org orig_output for IPv4 was only set for dsts which hit an input route. Set it consistently for locally generated traffic as well to allow lwt to continue the dst_output() path as configured by the nexthop. Fixes: 2536862311d ("lwt: Add support to redirect dst.input") Signed-off-by: Thomas Graf --- net/ipv4/route.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d37fc6f..0c39b62 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2154,8 +2154,10 @@ static struct rtable *__mkroute_output(const struct fib_result *res, } rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0); - if (lwtunnel_output_redirect(rth->dst.lwtstate)) + if (lwtunnel_output_redirect(rth->dst.lwtstate)) { + rth->dst.lwtstate->orig_output = rth->dst.output; rth->dst.output = lwtunnel_output; + } return rth; }