From owner-svn-src-user@FreeBSD.ORG Thu Oct 17 11:50:47 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B209EF15; Thu, 17 Oct 2013 11:50:47 +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 9FD6D28A9; Thu, 17 Oct 2013 11:50:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HBolmP048303; Thu, 17 Oct 2013 11:50:47 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HBolYV048302; Thu, 17 Oct 2013 11:50:47 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310171150.r9HBolYV048302@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 17 Oct 2013 11:50:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256679 - 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:50:47 -0000 Author: ae Date: Thu Oct 17 11:50:47 2013 New Revision: 256679 URL: http://svnweb.freebsd.org/changeset/base/256679 Log: Sort variables declarations, and initialize inc_fibnum and inc6_zoneid. 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:49:46 2013 (r256678) +++ user/ae/inet6/sys/netinet6/icmp6.c Thu Oct 17 11:50:47 2013 (r256679) @@ -1159,11 +1159,10 @@ icmp6_notify_error(struct mbuf **mp, int void icmp6_mtudisc_update(struct ip6ctlparam *ip6cp, int validated) { + struct in_conninfo inc; struct in6_addr *dst = ip6cp->ip6c_finaldst; struct icmp6_hdr *icmp6 = ip6cp->ip6c_icmp6; - struct mbuf *m = ip6cp->ip6c_m; /* will be necessary for scope issue */ u_int mtu = ntohl(icmp6->icmp6_mtu); - struct in_conninfo inc; #if 0 /* @@ -1198,11 +1197,11 @@ icmp6_mtudisc_update(struct ip6ctlparam mtu = IPV6_MMTU - 8; bzero(&inc, sizeof(inc)); + inc.inc_fibnum = M_GETFIB(ip6cp->ip6c_m); inc.inc_flags |= INC_ISIPV6; inc.inc6_faddr = *dst; - if (in6_setscope(&inc.inc6_faddr, m->m_pkthdr.rcvif, NULL)) - return; - + inc.inc6_zoneid = in6_getscopezone(ip6cp->ip6c_m->m_pkthdr.rcvif, + in6_addrscope(dst)); if (mtu < tcp_maxmtu6(&inc, NULL)) { tcp_hc_updatemtu(&inc, mtu); ICMP6STAT_INC(icp6s_pmtuchg);