svn commit: r197365 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci net

[Qing Li]

Author: qingli
Date: Sun Sep 20 17:46:56 2009
New Revision: 197365
URL: http://svn.freebsd.org/changeset/base/197365

Log:
  MFC	r197364
  
  A wrong variable is used when setting up the interface
  address route, which broke source address selection in
  some code paths.
  
  Submitted by:	noted by bz
  Reviewed by:	hrs
  Approved by:	re (kib)

Modified:
  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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/net/if.c

Modified: stable/8/sys/net/if.c
==============================================================================
--- stable/8/sys/net/if.c	Sun Sep 20 17:22:19 2009	(r197364)
+++ stable/8/sys/net/if.c	Sun Sep 20 17:46:56 2009	(r197365)
@@ -1432,9 +1432,9 @@ ifa_add_loopback_route(struct ifaddr *if
 	if (error == 0 && rt != NULL) {
 		RT_LOCK(rt);
 		((struct sockaddr_dl *)rt->rt_gateway)->sdl_type  =
-			rt->rt_ifp->if_type;
+			ifa->ifa_ifp->if_type;
 		((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
-			rt->rt_ifp->if_index;
+			ifa->ifa_ifp->if_index;
 		RT_REMREF(rt);
 		RT_UNLOCK(rt);
 	} else if (error != 0)