[IPV4]: Remove suprious use of goto out: in icmp_reply
authorHorms <horms@verge.net.au>
Fri, 3 Feb 2006 01:03:18 +0000 (17:03 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Feb 2006 01:03:18 +0000 (17:03 -0800)
This seems to be an artifact of the follwoing commit in February '02.

e7e173af42dbf37b1d946f9ee00219cb3b2bea6a

In a nutshell, goto out and return actually do the same thing,
and both are called in this function. This patch removes out.

Signed-Off-By: Horms <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/icmp.c

index 105039e..6bc0887 100644 (file)
@@ -385,7 +385,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
        u32 daddr;
 
        if (ip_options_echo(&icmp_param->replyopts, skb))
-               goto out;
+               return;
 
        if (icmp_xmit_lock())
                return;
@@ -416,7 +416,6 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
        ip_rt_put(rt);
 out_unlock:
        icmp_xmit_unlock();
-out:;
 }