From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 24 14:53:10 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A7391065675;
	Mon, 24 Jan 2011 14:53:10 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FC018FC12;
	Mon, 24 Jan 2011 14:53:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0OErAxl094060;
	Mon, 24 Jan 2011 14:53:10 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OErAn5094058;
	Mon, 24 Jan 2011 14:53:10 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201101241453.p0OErAn5094058@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 24 Jan 2011 14:53:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217782 - projects/sv/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jan 2011 14:53:10 -0000

Author: attilio
Date: Mon Jan 24 14:53:10 2011
New Revision: 217782
URL: http://svn.freebsd.org/changeset/base/217782

Log:
  Simplify locking conditional code.

Modified:
  projects/sv/sys/netinet/netdump_client.c

Modified: projects/sv/sys/netinet/netdump_client.c
==============================================================================
--- projects/sv/sys/netinet/netdump_client.c	Mon Jan 24 14:45:16 2011	(r217781)
+++ projects/sv/sys/netinet/netdump_client.c	Mon Jan 24 14:53:10 2011	(r217782)
@@ -1083,16 +1083,19 @@ netdump_trigger(void *arg, int howto)
 {
 	struct dumperinfo dumper;
 	void (*old_if_input)(struct ifnet *, struct mbuf *)=NULL;
-	int found;
+	int found, must_lock;
 
 	if ((howto&(RB_HALT|RB_DUMP))!=RB_DUMP || !nd_enable || cold ||
 	    dumping)
 		return;
 
 	found = 0;
+	must_lock = 1;
 #if defined(KDB) && !defined(KDB_UNATTENDED)
-	if (panicstr == NULL)
+	if (panicstr != NULL)
+		must_lock = 0;
 #endif
+	if (must_lock != 0)
 		IFNET_RLOCK_NOSLEEP();
 	TAILQ_FOREACH(nd_ifp, &V_ifnet, if_link) {
 		if (!strncmp(nd_ifp->if_xname, nd_ifp_str,
@@ -1101,9 +1104,7 @@ netdump_trigger(void *arg, int howto)
 			break;
 		}
 	}
-#if defined(KDB) && !defined(KDB_UNATTENDED)
-	if (panicstr == NULL)
-#endif
+	if (must_lock != 0)
 		IFNET_RUNLOCK_NOSLEEP();
 
 	if (found == 0) {
@@ -1139,12 +1140,8 @@ netdump_trigger(void *arg, int howto)
 	 * first time it gets called.  Adjust it accordingly.
 	 */
 	nd_server_port = NETDUMP_PORT;
-	if ((nd_ifp->if_capenable & IFCAP_POLLING) == 0) {
-#if defined(KDB) && !defined(KDB_UNATTENDED)
-		if (panicstr == NULL)
-#endif
-			nd_ifp->if_ndumpfuncs->ne_disable_intr(nd_ifp);
-	}
+	if ((nd_ifp->if_capenable & IFCAP_POLLING) == 0 && must_lock != 0)
+		nd_ifp->if_ndumpfuncs->ne_disable_intr(nd_ifp);
 
 	/* Make the card use *our* receive callback */
 	old_if_input = nd_ifp->if_input;
@@ -1194,12 +1191,8 @@ netdump_trigger(void *arg, int howto)
 trig_abort:
 	if (old_if_input)
 		nd_ifp->if_input = old_if_input;
-	if ((nd_ifp->if_capenable & IFCAP_POLLING) == 0) {
-#if defined(KDB) && !defined(KDB_UNATTENDED)
-		if (panicstr == NULL)
-#endif
-			nd_ifp->if_ndumpfuncs->ne_enable_intr(nd_ifp);
-	}
+	if ((nd_ifp->if_capenable & IFCAP_POLLING) == 0 && must_lock != 0)
+		nd_ifp->if_ndumpfuncs->ne_enable_intr(nd_ifp);
 	dumping--;
 }