netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsa@cumulusnetworks.com>
To: netdev@vger.kernel.org
Cc: David Ahern <dsa@cumulusnetworks.com>
Subject: [PATCH net-next 3/3] net: Add table id from route lookup to route response
Date: Wed,  2 Sep 2015 09:40:34 -0700	[thread overview]
Message-ID: <1441212034-37464-3-git-send-email-dsa@cumulusnetworks.com> (raw)
In-Reply-To: <1441212034-37464-1-git-send-email-dsa@cumulusnetworks.com>

rt_fill_info which is called for 'route get' requests hardcodes the
table id as RT_TABLE_MAIN which is not correct when multiple tables
are used. Use the newly added table id in the rtable to send back
the correct table.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
 net/ipv4/route.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 92acc95b7578..2738bf4132db 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2325,8 +2325,8 @@ static int rt_fill_info(struct net *net,  __be32 dst, __be32 src,
 	r->rtm_dst_len	= 32;
 	r->rtm_src_len	= 0;
 	r->rtm_tos	= fl4->flowi4_tos;
-	r->rtm_table	= RT_TABLE_MAIN;
-	if (nla_put_u32(skb, RTA_TABLE, RT_TABLE_MAIN))
+	r->rtm_table	= rt->rt_table_id;
+	if (nla_put_u32(skb, RTA_TABLE, rt->rt_table_id))
 		goto nla_put_failure;
 	r->rtm_type	= rt->rt_type;
 	r->rtm_scope	= RT_SCOPE_UNIVERSE;
-- 
1.9.1

  parent reply	other threads:[~2015-09-02 16:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-02 16:40 [PATCH net-next 1/3] net: Refactor rtable initialization David Ahern
2015-09-02 16:40 ` [PATCH net-next 2/3] net: Add FIB table id to rtable David Ahern
2015-09-02 16:40 ` David Ahern [this message]
2015-09-02 18:43   ` [PATCH net-next 3/3] net: Add table id from route lookup to route response Thomas Graf
2015-09-02 18:49     ` David Miller
2015-09-02 18:51       ` David Ahern
2015-09-02 19:08         ` Thomas Graf
2015-09-02 19:43           ` Andy Gospodarek
2015-09-02 20:18             ` Thomas Graf
2015-09-02 22:33             ` David Miller
2015-09-02 20:16           ` [PATCH net-next v2] " David Ahern
2015-09-02 20:23             ` Thomas Graf
2015-09-02 20:34               ` David Ahern
2015-09-02 20:41             ` Alexander Duyck
2015-09-02 20:47               ` David Ahern
2015-09-02 20:53             ` Stephen Hemminger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441212034-37464-3-git-send-email-dsa@cumulusnetworks.com \
    --to=dsa@cumulusnetworks.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).