From owner-svn-src-user@FreeBSD.ORG Thu Oct 17 11:43:55 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EB67CB18; Thu, 17 Oct 2013 11:43:55 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D96632846; Thu, 17 Oct 2013 11:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HBhtx9043234; Thu, 17 Oct 2013 11:43:55 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HBhtmY043233; Thu, 17 Oct 2013 11:43:55 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310171143.r9HBhtmY043233@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 17 Oct 2013 11:43:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256676 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 11:43:56 -0000 Author: ae Date: Thu Oct 17 11:43:55 2013 New Revision: 256676 URL: http://svnweb.freebsd.org/changeset/base/256676 Log: Remove in6_clearscope() calls. Don't clear ifnet pointer, now we don't have enough scope information in the IP header. Modified: user/ae/inet6/sys/netinet6/icmp6.c Modified: user/ae/inet6/sys/netinet6/icmp6.c ============================================================================== --- user/ae/inet6/sys/netinet6/icmp6.c Thu Oct 17 11:40:08 2013 (r256675) +++ user/ae/inet6/sys/netinet6/icmp6.c Thu Oct 17 11:43:55 2013 (r256676) @@ -360,26 +360,13 @@ icmp6_error(struct mbuf *m, int type, in nip6->ip6_src = oip6->ip6_src; nip6->ip6_dst = oip6->ip6_dst; - in6_clearscope(&oip6->ip6_src); - in6_clearscope(&oip6->ip6_dst); - icmp6 = (struct icmp6_hdr *)(nip6 + 1); icmp6->icmp6_type = type; icmp6->icmp6_code = code; icmp6->icmp6_pptr = htonl((u_int32_t)param); - /* - * icmp6_reflect() is designed to be in the input path. - * icmp6_error() can be called from both input and output path, - * and if we are in output path rcvif could contain bogus value. - * clear m->m_pkthdr.rcvif for safety, we should have enough scope - * information in ip header (nip6). - */ - m->m_pkthdr.rcvif = NULL; - ICMP6STAT_INC(icp6s_outhist[type]); icmp6_reflect(m, sizeof(struct ip6_hdr)); /* header order: IPv6 - ICMPv6 */ - return; freeit: