From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 10 21:46:37 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 725BB106566B;
	Mon, 10 Oct 2011 21:46:37 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 622EF8FC0A;
	Mon, 10 Oct 2011 21:46:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9ALkb6w084117;
	Mon, 10 Oct 2011 21:46:37 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9ALkbFM084115;
	Mon, 10 Oct 2011 21:46:37 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <201110102146.p9ALkbFM084115@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Mon, 10 Oct 2011 21:46:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226239 - stable/8/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Oct 2011 21:46:37 -0000

Author: qingli
Date: Mon Oct 10 21:46:37 2011
New Revision: 226239
URL: http://svn.freebsd.org/changeset/base/226239

Log:
  MFC 225223
  
  When an interface address route is removed from the system, another
  route with the same prefix is searched for as a replacement. The
  current code did not bypass routes that have non-operational
  interfaces. This patch fixes that bug and will find a replacement
  route with an active interface.
  
  PR:		kern/159603
  Submitted by:	pluknet, ambrisko at ambrisko dot com
  Reviewed by:	discussed on net@

Modified:
  stable/8/sys/netinet/in.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/netinet/in.c
==============================================================================
--- stable/8/sys/netinet/in.c	Mon Oct 10 21:43:53 2011	(r226238)
+++ stable/8/sys/netinet/in.c	Mon Oct 10 21:46:37 2011	(r226239)
@@ -1166,7 +1166,8 @@ in_scrubprefix(struct in_ifaddr *target,
 			p.s_addr &= ia->ia_sockmask.sin_addr.s_addr;
 		}
 
-		if (prefix.s_addr != p.s_addr)
+		if ((prefix.s_addr != p.s_addr) ||
+		    !(ia->ia_ifp->if_flags & IFF_UP))
 			continue;
 
 		/*