Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: Remove martian_source_keep_err goto label

Browse source 
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>
This commit is contained in:
David Ahern 2015-09-28 11:10:44 -07:00 • committed by David S. Miller
parent 75fea73dce
commit 0d7539603b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ipv4/route.c
View file

@ -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, err = fib_validate_source(skb, saddr, daddr, tos,
0, dev, in_dev, &itag); 0, dev, in_dev, &itag);
if (err < 0) if (err < 0)
goto martian_source_keep_err; goto martian_source;
goto local_input; goto local_input;
} }
@ -1781,7 +1781,7 @@ out: return err;
err = fib_validate_source(skb, saddr, 0, tos, 0, dev, err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
in_dev, &itag); in_dev, &itag);
if (err < 0) if (err < 0)
goto martian_source_keep_err; goto martian_source;
} }
flags |= RTCF_BROADCAST; flags |= RTCF_BROADCAST;
res.type = RTN_BROADCAST; res.type = RTN_BROADCAST;
@ -1857,8 +1857,6 @@ out: return err;
goto out; goto out;
martian_source: martian_source:
err = -EINVAL;
martian_source_keep_err:
ip_handle_martian_source(dev, in_dev, skb, daddr, saddr); ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);
goto out; goto out;
} }