From: David Ahern <dsa@cumulusnetworks.com>
To: netdev@vger.kernel.org
Cc: David Ahern <dsa@cumulusnetworks.com>
Subject: [PATCH net-next 7/7] net: ipv4: Remove event arg to rt_fill_info
Date: Mon, 9 Jan 2017 13:32:51 -0800 [thread overview]
Message-ID: <1483997571-3964-8-git-send-email-dsa@cumulusnetworks.com> (raw)
In-Reply-To: <1483997571-3964-1-git-send-email-dsa@cumulusnetworks.com>
rt_fill_info has 1 caller with the event set to RTM_NEWROUTE. Given that
remove the arg and use RTM_NEWROUTE directly in rt_fill_info.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
net/ipv4/route.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 9f44b869b8a6..b34f79ffb11d 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2471,8 +2471,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);
/* called with rcu_read_lock held */
static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
struct flowi4 *fl4, struct sk_buff *skb, u32 portid,
- u32 seq, int event, struct rtable *rt,
- struct fib_result *res)
+ u32 seq, struct rtable *rt, struct fib_result *res)
{
struct rtmsg *r;
struct nlmsghdr *nlh;
@@ -2480,7 +2479,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
u32 error;
u32 metrics[RTAX_MAX];
- nlh = nlmsg_put(skb, portid, seq, event, sizeof(*r), 0);
+ nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*r), 0);
if (!nlh)
return -EMSGSIZE;
@@ -2711,8 +2710,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
table_id = rt->rt_table_id;
err = rt_fill_info(net, dst, src, table_id, &fl4, skb,
- NETLINK_CB(in_skb).portid, nlh->nlmsg_seq,
- RTM_NEWROUTE, rt, &res);
+ NETLINK_CB(in_skb).portid, nlh->nlmsg_seq, rt, &res);
if (err < 0)
goto errout_free;
--
2.1.4
prev parent reply other threads:[~2017-01-09 21:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-09 21:32 [PATCH net-next 0/7] net: ivp4: return matching route for GETROUTE request David Ahern
2017-01-09 21:32 ` [PATCH net-next 1/7] net: ipv4: refactor __ip_route_output_key_hash David Ahern
2017-01-09 21:32 ` [PATCH net-next 2/7] net: ipv4: refactor ip_route_input_noref David Ahern
2017-01-09 21:32 ` [PATCH net-next 3/7] net: ipv4: Convert inet_rtm_getroute to rcu versions of route lookup David Ahern
2017-01-09 21:32 ` [PATCH net-next 4/7] net: ipv4: refactor fib_dump_info David Ahern
2017-01-09 21:32 ` [PATCH net-next 5/7] net: ipv4: Save trie prefix to fib lookup result David Ahern
2017-01-09 21:32 ` [PATCH net-next 6/7] net: ipv4: return route match in GETROUTE request David Ahern
2017-01-11 1:40 ` David Miller
2017-01-11 17:24 ` David Ahern
2017-01-09 21:32 ` David Ahern [this message]
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=1483997571-3964-8-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).