Date: Sun, 28 Nov 2010 13:01:10 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r215996 - stable/7/sys/netinet6 Message-ID: <201011281301.oASD1AT8016986@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sun Nov 28 13:01:10 2010 New Revision: 215996 URL: http://svn.freebsd.org/changeset/base/215996 Log: MFC r215559: In case of an early return from the function there is no need to zero the route upfront, so defer as long as we can. Modified: stable/7/sys/netinet6/nd6_nbr.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netinet6/nd6_nbr.c ============================================================================== --- stable/7/sys/netinet6/nd6_nbr.c Sun Nov 28 12:26:15 2010 (r215995) +++ stable/7/sys/netinet6/nd6_nbr.c Sun Nov 28 13:01:10 2010 (r215996) @@ -372,8 +372,6 @@ nd6_ns_output(struct ifnet *ifp, const s caddr_t mac; struct route_in6 ro; - bzero(&ro, sizeof(ro)); - if (IN6_IS_ADDR_MULTICAST(taddr6)) return; @@ -400,6 +398,8 @@ nd6_ns_output(struct ifnet *ifp, const s return; m->m_pkthdr.rcvif = NULL; + bzero(&ro, sizeof(ro)); + if (daddr6 == NULL || IN6_IS_ADDR_MULTICAST(daddr6)) { m->m_flags |= M_MCAST; im6o.im6o_multicast_ifp = ifp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011281301.oASD1AT8016986>