diff --git a/[refs] b/[refs] index dd576a837ff2..53c1336d4fae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95f7daf1c058dc6afbc2d33b6a65ce1bae132dc8 +refs/heads/master: f00c401b9b5f0a90e2eb05705f5988fbda0b082b diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 105039eb7629..6bc0887b0834 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -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:; }