From patchwork Fri Sep 13 03:00:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 274631 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 207592C00DE for ; Fri, 13 Sep 2013 13:01:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753600Ab3IMDBl (ORCPT ); Thu, 12 Sep 2013 23:01:41 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:35768 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750968Ab3IMDBk (ORCPT ); Thu, 12 Sep 2013 23:01:40 -0400 X-IronPort-AV: E=Sophos;i="4.90,895,1371052800"; d="scan'208";a="8511281" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 13 Sep 2013 10:58:28 +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 r8D31cPM021466; Fri, 13 Sep 2013 11:01:38 +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 2013091310591259-1479114 ; Fri, 13 Sep 2013 10:59:12 +0800 Message-ID: <52327FD9.8080108@cn.fujitsu.com> Date: Fri, 13 Sep 2013 11:00:41 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130612 Thunderbird/17.0.6 MIME-Version: 1.0 To: davem@davemloft.net CC: netdev@vger.kernel.org, hannes@stressinduktion.org Subject: [PATCH v2 3/6] ipv6: del statements for dealing with NDISC_REDIRECT References: <52327F00.4040802@cn.fujitsu.com> In-Reply-To: <52327F00.4040802@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/13 10:59:12, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/13 10:59:15, Serialize complete at 2013/09/13 10:59:15 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Duan Jiong Now the route updating for redirect is done in ndisc layer. Signed-off-by: Duan Jiong --- net/ipv6/icmp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index eef8d94..4bde43c 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -91,8 +91,6 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (type == ICMPV6_PKT_TOOBIG) ip6_update_pmtu(skb, net, info, 0, 0); - else if (type == NDISC_REDIRECT) - ip6_redirect(skb, net, skb->dev->ifindex, 0); if (!(type & ICMPV6_INFOMSG_MASK)) if (icmp6->icmp6_type == ICMPV6_ECHO_REQUEST)