From owner-svn-src-head@FreeBSD.ORG  Sat Jun 30 19:09:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B9C441065670;
	Sat, 30 Jun 2012 19:09:02 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A4D468FC12;
	Sat, 30 Jun 2012 19:09:02 +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 q5UJ926A036536;
	Sat, 30 Jun 2012 19:09:02 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UJ92LA036534;
	Sat, 30 Jun 2012 19:09:02 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <201206301909.q5UJ92LA036534@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sat, 30 Jun 2012 19:09:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237852 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jun 2012 19:09:02 -0000

Author: thompsa
Date: Sat Jun 30 19:09:02 2012
New Revision: 237852
URL: http://svn.freebsd.org/changeset/base/237852

Log:
  Add the same check as vlan(4) where we ignore the ifnet departure event if the
  interface is just being renamed.
  
  PR:		kern/169557
  Submitted by:	Mark Johnston
  MFC after:	3 days

Modified:
  head/sys/net/if_lagg.c

Modified: head/sys/net/if_lagg.c
==============================================================================
--- head/sys/net/if_lagg.c	Sat Jun 30 18:58:21 2012	(r237851)
+++ head/sys/net/if_lagg.c	Sat Jun 30 19:09:02 2012	(r237852)
@@ -797,6 +797,9 @@ lagg_port_ifdetach(void *arg __unused, s
 
 	if ((lp = ifp->if_lagg) == NULL)
 		return;
+	/* If the ifnet is just being renamed, don't do anything. */
+	if (ifp->if_flags & IFF_RENAMING)
+		return;
 
 	sc = lp->lp_softc;