From patchwork Wed Sep 18 12:04:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 275690 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 065EC2C00F3 for ; Wed, 18 Sep 2013 22:05:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752339Ab3IRMFx (ORCPT ); Wed, 18 Sep 2013 08:05:53 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:15467 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752062Ab3IRMFw (ORCPT ); Wed, 18 Sep 2013 08:05:52 -0400 X-IronPort-AV: E=Sophos;i="4.90,929,1371052800"; d="scan'208";a="8562705" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 18 Sep 2013 20:02:39 +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 r8IC5n3p013530; Wed, 18 Sep 2013 20:05:49 +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 2013091820041829-1608800 ; Wed, 18 Sep 2013 20:04:18 +0800 Message-ID: <523996E0.9080702@cn.fujitsu.com> Date: Wed, 18 Sep 2013 20:04:48 +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: David Miller CC: netdev@vger.kernel.org, hannes@stressinduktion.org Subject: [PATCH ] ipv6: handle the update of the NDISC_REDIRECT error code in icmpv6_err_convert X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/18 20:04:18, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/18 20:04:19, Serialize complete at 2013/09/18 20:04:19 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 in udpv6_err() and rawv6_err() the err shoud be assigned to 0, not EPROTO. Signed-off-by: Duan Jiong --- net/ipv6/icmp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index eef8d94..795f348 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -977,6 +977,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;