From patchwork Fri Sep 13 03:02:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 274633 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 B59752C00A9 for ; Fri, 13 Sep 2013 13:03:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120Ab3IMDDv (ORCPT ); Thu, 12 Sep 2013 23:03:51 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:17007 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751513Ab3IMDDu (ORCPT ); Thu, 12 Sep 2013 23:03:50 -0400 X-IronPort-AV: E=Sophos;i="4.90,895,1371052800"; d="scan'208";a="8511307" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 13 Sep 2013 11:00:07 +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 r8D33Gws021614; Fri, 13 Sep 2013 11:03:17 +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 2013091311005441-1479154 ; Fri, 13 Sep 2013 11:00:54 +0800 Message-ID: <5232803F.5010108@cn.fujitsu.com> Date: Fri, 13 Sep 2013 11:02:23 +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 5/6] ipv6: modify the err to 0 when 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 11:00:54, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/13 11:00:54, Serialize complete at 2013/09/13 11:00:54 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Duan Jiong when dealing with redirect message, the err shoud be assigned to 0, not EPROTO. And del the statements for updating route. Signed-off-by: Duan Jiong --- net/ipv6/icmp.c | 3 +++ net/ipv6/raw.c | 3 +-- net/ipv6/udp.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4bde43c..6bcedcc 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -975,6 +975,9 @@ int icmpv6_err_convert(u8 type, u8 code, int *err) case ICMPV6_TIME_EXCEED: *err = EHOSTUNREACH; break; + case NDISC_REDIRECT: + *err = 0; + break; } return fatal; diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 58916bb..baf86b8 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -335,8 +335,7 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb, ip6_sk_update_pmtu(skb, sk, info); harderr = (np->pmtudisc == IPV6_PMTUDISC_DO); } - if (type == NDISC_REDIRECT) - ip6_sk_redirect(skb, sk); + if (np->recverr) { u8 *payload = skb->data; if (!inet->hdrincl) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index f405815..a40b392 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -525,8 +525,6 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (type == ICMPV6_PKT_TOOBIG) ip6_sk_update_pmtu(skb, sk, info); - if (type == NDISC_REDIRECT) - ip6_sk_redirect(skb, sk); np = inet6_sk(sk);