From: Alexander Duyck <alexander.duyck@gmail.com>
To: David Ahern <dsa@cumulusnetworks.com>, netdev@vger.kernel.org
Subject: Re: [PATCH net-next 2/9] net: Remove e_inval label from ip_route_input_slow
Date: Wed, 23 Sep 2015 08:45:05 -0700 [thread overview]
Message-ID: <5602C901.2050404@gmail.com> (raw)
In-Reply-To: <1443021322-48621-3-git-send-email-dsa@cumulusnetworks.com>
On 09/23/2015 08:15 AM, David Ahern wrote:
> e_inval has 1 explicit user and 1 fallthrough user -- martian_destination.
> Move setting err to EINVAL before the 2 users and use the goto out label
> instead of e_inval.
>
> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
> ---
> net/ipv4/route.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index ef36dfed24da..3c5000db5972 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -1775,8 +1775,9 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
> out: return err;
>
> brd_input:
> + err = -EINVAL;
> if (skb->protocol != htons(ETH_P_IP))
> - goto e_inval;
> + goto out;
>
> if (!ipv4_is_zeronet(saddr)) {
> err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
> @@ -1842,15 +1843,13 @@ out: return err;
> * 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
> -
> -e_inval:
> - err = -EINVAL;
> goto out;
>
> e_nobufs:
This is adding unnecessary bloat to the code. I really think if you
want to simplify this just replace "goto e_inval;" with "return -EINVAL;".
Also why is it you end up leaving the out label through all of these
patches? It seems like that would be one of the first places to start
in terms of removing the labels.
- Alex
next prev parent reply other threads:[~2015-09-23 15:45 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 [this message]
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 ` [PATCH net-next 5/9] net: Move martian_destination " David Ahern
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 2/9] net: Remove e_inval label from ip_route_input_slow 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=5602C901.2050404@gmail.com \
--to=alexander.duyck@gmail.com \
--cc=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).