From patchwork Thu Sep 12 10:46:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 274499 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 98F5F2C0336 for ; Thu, 12 Sep 2013 20:47:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754580Ab3ILKrq (ORCPT ); Thu, 12 Sep 2013 06:47:46 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:47073 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751691Ab3ILKrp (ORCPT ); Thu, 12 Sep 2013 06:47:45 -0400 X-IronPort-AV: E=Sophos;i="4.90,890,1371052800"; d="scan'208";a="8503978" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 12 Sep 2013 18:44:33 +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 r8CAlgb9027826; Thu, 12 Sep 2013 18:47:42 +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 2013091218452073-1456643 ; Thu, 12 Sep 2013 18:45:20 +0800 Message-ID: <52319B99.6090303@cn.fujitsu.com> Date: Thu, 12 Sep 2013 18:46:49 +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 04/11] ipv6: move route updating for redirect to ndisc layer References: <52319A6E.6090503@cn.fujitsu.com> In-Reply-To: <52319A6E.6090503@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/12 18:45:20, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/12 18:45:21, Serialize complete at 2013/09/12 18:45:21 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Duan Jiong So the esp6_err() only handle the ICMPV6_PKT_TOOBIG. Signed-off-by: Duan Jiong --- net/ipv6/esp6.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index d3618a7..6aa64e1 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -436,9 +436,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset); struct xfrm_state *x; - if (type != ICMPV6_DEST_UNREACH && - type != ICMPV6_PKT_TOOBIG && - type != NDISC_REDIRECT) + if (type != ICMPV6_PKT_TOOBIG) return; x = xfrm_state_lookup(net, skb->mark, (const xfrm_address_t *)&iph->daddr, @@ -446,10 +444,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (!x) return; - if (type == NDISC_REDIRECT) - ip6_redirect(skb, net, skb->dev->ifindex, 0); - else - ip6_update_pmtu(skb, net, info, 0, 0); + ip6_update_pmtu(skb, net, info, 0, 0); xfrm_state_put(x); }