From owner-svn-src-user@freebsd.org  Thu May 12 19:47:39 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06D87B38AE4
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Thu, 12 May 2016 19:47:39 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCD0513E2;
 Thu, 12 May 2016 19:47:38 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CJlcKm032037;
 Thu, 12 May 2016 19:47:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CJlcWk032036;
 Thu, 12 May 2016 19:47:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605121947.u4CJlcWk032036@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 12 May 2016 19:47:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r299560 - user/ngie/ntb-hacking/sys/dev/ntb/if_ntb
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2016 19:47:39 -0000

Author: ngie
Date: Thu May 12 19:47:37 2016
New Revision: 299560
URL: https://svnweb.freebsd.org/changeset/base/299560

Log:
  Restore some of the previous teardown logic in ntb_teardown_interface(..) removed in
  r290684
  
  I suspect this might fix some of the panics on detach by clearing the queue. We'll see..
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  user/ngie/ntb-hacking/sys/dev/ntb/if_ntb/if_ntb.c

Modified: user/ngie/ntb-hacking/sys/dev/ntb/if_ntb/if_ntb.c
==============================================================================
--- user/ngie/ntb-hacking/sys/dev/ntb/if_ntb/if_ntb.c	Thu May 12 19:42:13 2016	(r299559)
+++ user/ngie/ntb-hacking/sys/dev/ntb/if_ntb/if_ntb.c	Thu May 12 19:47:37 2016	(r299560)
@@ -450,19 +450,21 @@ static int
 ntb_teardown_interface(void)
 {
 
-	if (net_softc.qp != NULL) {
+	/* Bring the link down before detaching everything */
+	if (net_softc.qp != NULL)
 		ntb_transport_link_down(net_softc.qp);
 
-		ntb_transport_free_queue(net_softc.qp);
-		ntb_transport_free(&net_softc);
-	}
-
 	if (net_softc.ifp != NULL) {
 		ether_ifdetach(net_softc.ifp);
 		if_free(net_softc.ifp);
 		net_softc.ifp = NULL;
 	}
 
+	if (net_softc.qp != NULL) {
+		ntb_transport_free_queue(net_softc.qp);
+		ntb_transport_free(&net_softc);
+	}
+
 	return (0);
 }