Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d753960 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75fea73d

net/ipv4/route.c

+2 −4
Original line number Diff line number Diff line
@@ -1759,7 +1759,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;

	}
@@ -1781,7 +1781,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;
@@ -1857,8 +1857,6 @@ out: return err; 
	goto out;



martian_source:

	err = -EINVAL;

martian_source_keep_err:

	ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);

	goto out;

}