diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2015-09-28 11:10:44 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-29 16:27:47 -0700 |
| commit | 0d7539603bba77b72679d53e7d7eb84c16dd76d8 (patch) | |
| tree | d2b02fd6fdeb54f8a8cd2a0493b07a27ff698b0b /net | |
| parent | net: Swap ordering of tests in ip_route_input_mc (diff) | |
| download | linux-dev-0d7539603bba77b72679d53e7d7eb84c16dd76d8.tar.xz linux-dev-0d7539603bba77b72679d53e7d7eb84c16dd76d8.zip | |
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>
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 43508c8d08e2..8c84a6664b30 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -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 @@ brd_input: 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 @@ e_nobufs: goto out; martian_source: - err = -EINVAL; -martian_source_keep_err: ip_handle_martian_source(dev, in_dev, skb, daddr, saddr); goto out; } |