svn commit: r256679 - user/ae/inet6/sys/netinet6

[Andrey V. Elsukov]

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);