From patchwork Sun Jan 12 09:52:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 309568 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4F6062C009B for ; Sun, 12 Jan 2014 20:53:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751180AbaALJwy (ORCPT ); Sun, 12 Jan 2014 04:52:54 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63965 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751122AbaALJwx (ORCPT ); Sun, 12 Jan 2014 04:52:53 -0500 X-IronPort-AV: E=Sophos;i="4.95,646,1384272000"; d="scan'208";a="9405860" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 12 Jan 2014 17:49:10 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s0C9qmYY001432; Sun, 12 Jan 2014 17:52:48 +0800 Received: from [10.167.225.86] ([10.167.225.86]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014011217514046-1006748 ; Sun, 12 Jan 2014 17:51:40 +0800 Message-ID: <52D265D4.9050600@cn.fujitsu.com> Date: Sun, 12 Jan 2014 17:52:20 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org Subject: [PATCH] ipv4: delete the statements limit icmp message in ip_error() X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/12 17:51:40, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/12 17:51:40, Serialize complete at 2014/01/12 17:51:40 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Because after the icmp_send() is called, the icmpv4_xrlim_allow() will be called to limit the icmp message too. Signed-off-by: Duan Jiong --- net/ipv4/route.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f8da282..e521de1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -900,10 +900,7 @@ static int ip_error(struct sk_buff *skb) { struct in_device *in_dev = __in_dev_get_rcu(skb->dev); struct rtable *rt = skb_rtable(skb); - struct inet_peer *peer; - unsigned long now; struct net *net; - bool send; int code; net = dev_net(rt->dst.dev); @@ -936,23 +933,7 @@ static int ip_error(struct sk_buff *skb) break; } - peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, 1); - - send = true; - if (peer) { - now = jiffies; - peer->rate_tokens += now - peer->rate_last; - if (peer->rate_tokens > ip_rt_error_burst) - peer->rate_tokens = ip_rt_error_burst; - peer->rate_last = now; - if (peer->rate_tokens >= ip_rt_error_cost) - peer->rate_tokens -= ip_rt_error_cost; - else - send = false; - inet_putpeer(peer); - } - if (send) - icmp_send(skb, ICMP_DEST_UNREACH, code, 0); + icmp_send(skb, ICMP_DEST_UNREACH, code, 0); out: kfree_skb(skb); return 0;