From owner-svn-src-all@FreeBSD.ORG  Wed May 22 17:13:04 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 1293E102;
 Wed, 22 May 2013 17:13:04 +0000 (UTC)
 (envelope-from gibbs@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 04CAC77E;
 Wed, 22 May 2013 17:13:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4MHD3LI083574;
 Wed, 22 May 2013 17:13:03 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4MHD3n7083573;
 Wed, 22 May 2013 17:13:03 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201305221713.r4MHD3n7083573@svn.freebsd.org>
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Wed, 22 May 2013 17:13:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250913 - head/sys/dev/xen/netfront
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: Wed, 22 May 2013 17:13:04 -0000

Author: gibbs
Date: Wed May 22 17:13:03 2013
New Revision: 250913
URL: http://svnweb.freebsd.org/changeset/base/250913

Log:
  Correct panic on detach of Xen PV network interfaces.
  
  dev/xen/netfront:
      In netif_free(), properly stop the interface and drain any pending
      timers prior to disconnecting from the backend device.
  
      Remove all media and detach our interface object from the system
      prior to deleting it.
  
  PR:		kern/176471
  Submitted by:	Roger Pau Monne <roger.pau@citrix.com>
  Reviewed by:	gibbs
  MFC after:	1 week

Modified:
  head/sys/dev/xen/netfront/netfront.c

Modified: head/sys/dev/xen/netfront/netfront.c
==============================================================================
--- head/sys/dev/xen/netfront/netfront.c	Wed May 22 16:33:28 2013	(r250912)
+++ head/sys/dev/xen/netfront/netfront.c	Wed May 22 17:13:03 2013	(r250913)
@@ -2171,10 +2171,14 @@ netfront_detach(device_t dev)
 static void
 netif_free(struct netfront_info *info)
 {
+	XN_LOCK(info);
+	xn_stop(info);
+	XN_UNLOCK(info);
+	callout_drain(&info->xn_stat_ch);
 	netif_disconnect_backend(info);
-#if 0
-	close_netdev(info);
-#endif
+	ifmedia_removeall(&info->sc_media);
+	ether_ifdetach(info->xn_ifp);
+	if_free(info->xn_ifp);
 }
 
 static void