From owner-svn-src-all@FreeBSD.ORG  Thu Mar 28 20:37:07 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C256F263;
 Thu, 28 Mar 2013 20:37:07 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B3AAC1C6;
 Thu, 28 Mar 2013 20:37:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SKb7tT091523;
 Thu, 28 Mar 2013 20:37:07 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SKb7eU091522;
 Thu, 28 Mar 2013 20:37:07 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201303282037.r2SKb7eU091522@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 28 Mar 2013 20:37:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248851 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 20:37:07 -0000

Author: markj
Date: Thu Mar 28 20:37:07 2013
New Revision: 248851
URL: http://svnweb.freebsd.org/changeset/base/248851

Log:
  Ignore interface renames instead of removing the interface from the bridge
  group.
  
  Reviewed by:	rstone
  Approved by:	rstone (co-mentor)
  Sponsored by:	Sandvine Incorporated
  MFC after:	1 week

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Thu Mar 28 20:35:37 2013	(r248850)
+++ head/sys/net/if_bridge.c	Thu Mar 28 20:37:07 2013	(r248851)
@@ -1700,6 +1700,9 @@ bridge_ifdetach(void *arg __unused, stru
 	struct bridge_softc *sc = ifp->if_bridge;
 	struct bridge_iflist *bif;
 
+	if (ifp->if_flags & IFF_RENAMING)
+		return;
+
 	/* Check if the interface is a bridge member */
 	if (sc != NULL) {
 		BRIDGE_LOCK(sc);