From owner-svn-src-projects@FreeBSD.ORG Sat Aug 7 17:30:15 2010
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 6E1E41065676;
Sat, 7 Aug 2010 17:30:15 +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 435828FC15;
Sat, 7 Aug 2010 17:30:15 +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 o77HUFFr007404;
Sat, 7 Aug 2010 17:30:15 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77HUFGj007402;
Sat, 7 Aug 2010 17:30:15 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008071730.o77HUFGj007402@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 7 Aug 2010 17:30:15 +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: r211028 - projects/sv/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
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: Sat, 07 Aug 2010 17:30:15 -0000
Author: attilio
Date: Sat Aug 7 17:30:15 2010
New Revision: 211028
URL: http://svn.freebsd.org/changeset/base/211028
Log:
Strip nd_active as it completely aliases nd_enabled, at least in its
current usage.
Modified:
projects/sv/sys/net/netdump_client.c
Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c Sat Aug 7 17:19:46 2010 (r211027)
+++ projects/sv/sys/net/netdump_client.c Sat Aug 7 17:30:15 2010 (r211028)
@@ -162,7 +162,6 @@ static unsigned char buf[MAXDUMPPGS*PAGE
* us */
static struct ether_addr nd_server_mac;
-static int nd_active = 0;
static int nd_enable = 0; /* if we should perform a network dump */
static struct in_addr nd_server = {INADDR_ANY}; /* server address */
static struct in_addr nd_client = {INADDR_ANY}; /* client (our) address */
@@ -1177,25 +1176,25 @@ netdump_trigger(void *arg, int howto)
u_int cpumap=0;
#endif
- if ((howto&(RB_HALT|RB_DUMP))!=RB_DUMP || !nd_enable || nd_active) {
+ if ((howto&(RB_HALT|RB_DUMP))!=RB_DUMP || !nd_enable) {
return;
}
- nd_active = 1;
+ nd_enable = 0;
if (!nd_nic) {
printf("netdump_trigger: Can't netdump: no NIC given\n");
- nd_active = 0;
+ nd_enable = 1;
return;
}
if (nd_server.s_addr == INADDR_ANY) {
printf("netdump_trigger: Can't netdump; no server IP given\n");
- nd_active = 0;
+ nd_enable = 1;
return;
}
if (nd_client.s_addr == INADDR_ANY) {
printf("netdump_trigger: Can't netdump; no client IP given\n");
- nd_active = 0;
+ nd_enable = 1;
return;
}
@@ -1242,7 +1241,7 @@ netdump_trigger(void *arg, int howto)
if(error) {
printf("netdump_trigger: Could not acquire lock on %s\n", nd_nic->if_xname);
- nd_active = 0;
+ nd_enable = 1;
return;
}
@@ -1311,7 +1310,7 @@ cleanup:
restart_cpus(cpumap);
}
#endif
- nd_active = 0;
+ nd_enable = 1;
}
/*-
@@ -1452,13 +1451,9 @@ DECLARE_MODULE(netdump, netdump_mod, SI_
#ifdef DDB
DB_COMMAND(netdump, ddb_force_netdump)
{
- if(nd_active) {
- db_printf("netdump in progress");
- return;
- }
if(!nd_enable) {
- db_printf("netdump not enabled");
+ db_printf("Netdump not enabled -- could be in progress");
return;
}