svn commit: r216010 - stable/8/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sun Nov 28 17:02:02 2010
New Revision: 216010
URL: http://svn.freebsd.org/changeset/base/216010

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/8/sys/netinet6/nd6_nbr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet6/nd6_nbr.c
==============================================================================
--- stable/8/sys/netinet6/nd6_nbr.c	Sun Nov 28 16:31:39 2010	(r216009)
+++ stable/8/sys/netinet6/nd6_nbr.c	Sun Nov 28 17:02:02 2010	(r216010)
@@ -388,8 +388,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;
 
@@ -416,6 +414,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;