From owner-svn-src-stable-8@FreeBSD.ORG Wed Oct 28 21:45:25 2009 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B657D1065679; Wed, 28 Oct 2009 21:45:25 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A38308FC1C; Wed, 28 Oct 2009 21:45:25 +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 n9SLjPKD073402; Wed, 28 Oct 2009 21:45:25 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9SLjPek073398; Wed, 28 Oct 2009 21:45:25 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <200910282145.n9SLjPek073398@svn.freebsd.org> From: Qing Li Date: Wed, 28 Oct 2009 21:45:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198567 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci netinet netinet6 X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2009 21:45:25 -0000 Author: qingli Date: Wed Oct 28 21:45:25 2009 New Revision: 198567 URL: http://svn.freebsd.org/changeset/base/198567 Log: MFC r198418 Use the correct option name in the preprocessor command to enable or disable diagnostic messages. Reviewed by: ru Modified: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet/if_ether.c stable/8/sys/netinet/in.c stable/8/sys/netinet6/in6.c Modified: stable/8/sys/netinet/if_ether.c ============================================================================== --- stable/8/sys/netinet/if_ether.c Wed Oct 28 21:43:16 2009 (r198566) +++ stable/8/sys/netinet/if_ether.c Wed Oct 28 21:45:25 2009 (r198567) @@ -172,7 +172,7 @@ arptimer(void *arg) callout_active(&lle->la_timer))) { (void) llentry_free(lle); } -#ifdef DIAGNOSTICS +#ifdef DIAGNOSTIC else { struct sockaddr *l3addr = L3_ADDR(lle); log(LOG_INFO, "arptimer issue: %p, IPv4 address: \"%s\"\n", lle, Modified: stable/8/sys/netinet/in.c ============================================================================== --- stable/8/sys/netinet/in.c Wed Oct 28 21:43:16 2009 (r198566) +++ stable/8/sys/netinet/in.c Wed Oct 28 21:45:25 2009 (r198567) @@ -1327,7 +1327,7 @@ in_lltable_rtcheck(struct ifnet *ifp, co /* XXX rtalloc1 should take a const param */ rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0); if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || rt->rt_ifp != ifp) { -#ifdef DIAGNOSTICS +#ifdef DIAGNOSTIC log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); #endif @@ -1366,7 +1366,7 @@ in_lltable_lookup(struct lltable *llt, u break; } if (lle == NULL) { -#ifdef DIAGNOSTICS +#ifdef DIAGNOSTIC if (flags & LLE_DELETE) log(LOG_INFO, "interface address is missing from cache = %p in delete\n", lle); #endif @@ -1400,7 +1400,7 @@ in_lltable_lookup(struct lltable *llt, u LLE_WLOCK(lle); lle->la_flags = LLE_DELETED; LLE_WUNLOCK(lle); -#ifdef DIAGNOSTICS +#ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif } Modified: stable/8/sys/netinet6/in6.c ============================================================================== --- stable/8/sys/netinet6/in6.c Wed Oct 28 21:43:16 2009 (r198566) +++ stable/8/sys/netinet6/in6.c Wed Oct 28 21:45:25 2009 (r198567) @@ -2430,7 +2430,7 @@ in6_lltable_lookup(struct lltable *llt, LLE_WLOCK(lle); lle->la_flags = LLE_DELETED; LLE_WUNLOCK(lle); -#ifdef DIAGNOSTICS +#ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif }