From: David Ahern <dsa@cumulusnetworks.com>
To: netdev@vger.kernel.org
Cc: David Ahern <dsa@cumulusnetworks.com>
Subject: [PATCH net-next 5/9] net: Move martian_destination to helper
Date: Wed, 23 Sep 2015 08:15:18 -0700 [thread overview]
Message-ID: <1443021322-48621-6-git-send-email-dsa@cumulusnetworks.com> (raw)
In-Reply-To: <1443021322-48621-1-git-send-email-dsa@cumulusnetworks.com>
Move stat and logging for martian_destination error into helper function
similar to ip_handle_martian_source. Code move only; no functional change.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
net/ipv4/route.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 35a19d15232a..8e0fb1e4de72 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1531,6 +1531,20 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
return err;
}
+/*
+ * Do not cache martian addresses: they should be logged (RFC1812)
+ */
+static void ip_handle_martian_dest(struct net_device *dev,
+ struct in_device *in_dev,
+ __be32 daddr, __be32 saddr)
+{
+ RT_CACHE_STAT_INC(in_martian_dst);
+#ifdef CONFIG_IP_ROUTE_VERBOSE
+ if (IN_DEV_LOG_MARTIANS(in_dev))
+ net_warn_ratelimited("martian destination %pI4 from %pI4, dev %s\n",
+ &daddr, &saddr, dev->name);
+#endif
+}
static void ip_handle_martian_source(struct net_device *dev,
struct in_device *in_dev,
@@ -1855,17 +1869,9 @@ out: return err;
res.table = NULL;
goto local_input;
- /*
- * Do not cache martian addresses: they should be logged (RFC1812)
- */
martian_destination:
err = -EINVAL;
- RT_CACHE_STAT_INC(in_martian_dst);
-#ifdef CONFIG_IP_ROUTE_VERBOSE
- if (IN_DEV_LOG_MARTIANS(in_dev))
- net_warn_ratelimited("martian destination %pI4 from %pI4, dev %s\n",
- &daddr, &saddr, dev->name);
-#endif
+ ip_handle_martian_dest(dev, in_dev, daddr, saddr);
goto out;
martian_source:
--
1.9.1
next prev parent reply other threads:[~2015-09-23 15:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-23 15:15 [PATCH net-next 0/9 v2] net: Refactor ip_route_input_slow David Ahern
2015-09-23 15:15 ` [PATCH net-next 1/9] net: Remove martian_source_keep_err goto label David Ahern
2015-09-23 16:19 ` Tom Herbert
2015-09-23 16:22 ` David Ahern
2015-09-23 15:15 ` [PATCH net-next 2/9] net: Remove e_inval label from ip_route_input_slow David Ahern
2015-09-23 15:45 ` Alexander Duyck
2015-09-23 16:02 ` David Ahern
2015-09-23 16:31 ` Alexander Duyck
2015-09-23 17:13 ` David Ahern
2015-09-23 17:38 ` Alexander Duyck
2015-09-23 18:03 ` David Ahern
2015-09-23 18:19 ` David Miller
2015-09-23 22:26 ` Alexander Duyck
2015-09-23 18:14 ` David Miller
2015-09-23 15:15 ` [PATCH net-next 3/9] net: Remove e_nobufs " David Ahern
2015-09-23 15:15 ` [PATCH net-next 4/9] net: Move rth handling from ip_route_input_slow to helper David Ahern
2015-09-23 15:15 ` David Ahern [this message]
2015-09-23 15:15 ` [PATCH net-next 6/9] net: Remove martian_source goto David Ahern
2015-09-23 15:15 ` [PATCH net-next 7/9] net: Remove martian_destination label David Ahern
2015-09-23 17:27 ` Eric Dumazet
2015-09-23 15:15 ` [PATCH net-next 8/9] net: Remove local_input label David Ahern
2015-09-23 15:15 ` [PATCH net-next 9/9] net: Remove no_route label David Ahern
2015-09-23 15:30 ` [PATCH net-next 0/9 v2] net: Refactor ip_route_input_slow Eric Dumazet
2015-09-23 16:08 ` David Ahern
2015-09-23 17:33 ` Eric Dumazet
-- strict thread matches above, loose matches on Subject: below --
2015-09-22 22:55 [PATCH net-next 0/9] " David Ahern
2015-09-22 22:55 ` [PATCH net-next 5/9] net: Move martian_destination to helper David Ahern
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=1443021322-48621-6-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).