From owner-svn-src-all@FreeBSD.ORG  Wed Sep 26 22:13:04 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 062501065672;
	Wed, 26 Sep 2012 22:13:04 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4E918FC25;
	Wed, 26 Sep 2012 22:13:03 +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 q8QMD3KN001712;
	Wed, 26 Sep 2012 22:13:03 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QMD3WI001710;
	Wed, 26 Sep 2012 22:13:03 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201209262213.q8QMD3WI001710@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 26 Sep 2012 22:13:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240976 - stable/9/sys/dev/netmap
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 26 Sep 2012 22:13:04 -0000

Author: emaste
Date: Wed Sep 26 22:13:03 2012
New Revision: 240976
URL: http://svn.freebsd.org/changeset/base/240976

Log:
  MFC part of r239149:
  
  Comment out the knlist_destroy for now as there is currently no
  knlist_init.

Modified:
  stable/9/sys/dev/netmap/netmap.c

Modified: stable/9/sys/dev/netmap/netmap.c
==============================================================================
--- stable/9/sys/dev/netmap/netmap.c	Wed Sep 26 21:55:13 2012	(r240975)
+++ stable/9/sys/dev/netmap/netmap.c	Wed Sep 26 22:13:03 2012	(r240976)
@@ -1033,16 +1033,17 @@ netmap_detach(struct ifnet *ifp)
 		return;
 
 	for (i = 0; i < na->num_tx_rings + 1; i++) {
-		knlist_destroy(&na->tx_rings[i].si.si_note);
+		/* knlist_destroy(&na->tx_rings[i].si.si_note); */
 		mtx_destroy(&na->tx_rings[i].q_lock);
 	}
 	for (i = 0; i < na->num_rx_rings + 1; i++) {
-		knlist_destroy(&na->rx_rings[i].si.si_note);
+		/* knlist_destroy(&na->rx_rings[i].si.si_note); */
 		mtx_destroy(&na->rx_rings[i].q_lock);
 	}
 	mtx_destroy(&na->core_lock);
-	knlist_destroy(&na->tx_si.si_note);
-	knlist_destroy(&na->rx_si.si_note);
+	/* XXX kqueue(9) needed; these will mirror knlist_init. */
+	/* knlist_destroy(&na->tx_si.si_note); */
+	/* knlist_destroy(&na->rx_si.si_note); */
 	bzero(na, sizeof(*na));
 	WNA(ifp) = NULL;
 	free(na, M_DEVBUF);