From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 11 Nov 2007 05:26:41 +0000 (-0800)
Subject: [IPV4]: Remove bugus goto-s from ip_route_input_slow
X-Git-Tag: v2.6.24-rc3~155^2~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1667609cd9a98ce32559e06f36fca54c775a51f;p=linux-2.6

[IPV4]: Remove bugus goto-s from ip_route_input_slow

Both places look like

        if (err == XXX)
               goto yyy;
   done:

while both yyy targets look like

        err = XXX;
        goto done;

so this is ok to remove the above if-s.

yyy labels are used in other places and are not removed.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 21b12de9e6..c95b270ba3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1813,11 +1813,6 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
 		goto martian_destination;
 
 	err = ip_mkroute_input(skb, &res, &fl, in_dev, daddr, saddr, tos);
-	if (err == -ENOBUFS)
-		goto e_nobufs;
-	if (err == -EINVAL)
-		goto e_inval;
-
 done:
 	in_dev_put(in_dev);
 	if (free_res)