[net-next,1/9] net: Remove martian_source_keep_err goto label

err is initialized to -EINVAL when it is declared. It is not reset until
fib_lookup which is well after the 3 users of the martian_source jump. So
resetting err to -EINVAL at martian_source label is not needed.

Removing that line obviates the need for the martian_source_keep_err label
so delete it.

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

On Wed, Sep 23, 2015 at 8:15 AM, David Ahern <dsa@cumulusnetworks.com> wrote:
> err is initialized to -EINVAL when it is declared. It is not reset until
> fib_lookup which is well after the 3 users of the martian_source jump. So
> resetting err to -EINVAL at martian_source label is not needed.
>
> Removing that line obviates the need for the martian_source_keep_err label
> so delete it.
>
> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
> ---
>  net/ipv4/route.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index 80f7c5b7b832..ef36dfed24da 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -1760,7 +1760,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
>                 err = fib_validate_source(skb, saddr, daddr, tos,
>                                           0, dev, in_dev, &itag);
>                 if (err < 0)
> -                       goto martian_source_keep_err;
> +                       goto martian_source;
>                 goto local_input;
>         }
>
> @@ -1782,7 +1782,7 @@ out:      return err;
>                 err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
>                                           in_dev, &itag);
>                 if (err < 0)
> -                       goto martian_source_keep_err;
> +                       goto martian_source;
>         }
>         flags |= RTCF_BROADCAST;
>         res.type = RTN_BROADCAST;
> @@ -1858,8 +1858,6 @@ out:      return err;
>         goto out;
>
>  martian_source:
> -       err = -EINVAL;
Just remove t=above line, no need to rename label.

> -martian_source_keep_err:
>         ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);
>         goto out;
>  }
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On 9/23/15 10:19 AM, Tom Herbert wrote:
>> @@ -1782,7 +1782,7 @@ out:      return err;
>>                  err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
>>                                            in_dev, &itag);
>>                  if (err < 0)
>> -                       goto martian_source_keep_err;
>> +                       goto martian_source;
>>          }
>>          flags |= RTCF_BROADCAST;
>>          res.type = RTN_BROADCAST;
>> @@ -1858,8 +1858,6 @@ out:      return err;
>>          goto out;
>>
>>   martian_source:
>> -       err = -EINVAL;
> Just remove t=above line, no need to rename label.
>

This is a stepping stone patch. It removes the unnecessary EINVAL and 
then drops one of the duplicate labels as setup for later patches. By 
patch 9 all of this is gone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html