From owner-freebsd-net@FreeBSD.ORG  Thu Jul 14 04:30:15 2011
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93E551065674
	for <freebsd-net@hub.freebsd.org>; Thu, 14 Jul 2011 04:30:15 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 846B18FC08
	for <freebsd-net@hub.freebsd.org>; Thu, 14 Jul 2011 04:30:15 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6E4UFj1058449
	for <freebsd-net@freefall.freebsd.org>; Thu, 14 Jul 2011 04:30:15 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6E4UFmt058446;
	Thu, 14 Jul 2011 04:30:15 GMT (envelope-from gnats)
Date: Thu, 14 Jul 2011 04:30:15 GMT
Message-Id: <201107140430.p6E4UFmt058446@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/154831: commit references a PR
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jul 2011 04:30:15 -0000

The following reply was made to PR kern/154831; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/154831: commit references a PR
Date: Thu, 14 Jul 2011 04:21:36 +0000 (UTC)

 Author: ae
 Date: Thu Jul 14 04:21:27 2011
 New Revision: 223995
 URL: http://svn.freebsd.org/changeset/base/223995
 
 Log:
   MFC r223840:
     Add again the checking for log_arp_permanent_modify that was by accident
     removed in the r186119.
   
     PR:		kern/154831
 
 Modified:
   stable/8/sys/netinet/if_ether.c
 Directory Properties:
   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)
 
 Modified: stable/8/sys/netinet/if_ether.c
 ==============================================================================
 --- stable/8/sys/netinet/if_ether.c	Thu Jul 14 03:16:43 2011	(r223994)
 +++ stable/8/sys/netinet/if_ether.c	Thu Jul 14 04:21:27 2011	(r223995)
 @@ -680,11 +680,13 @@ match:
  		    bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) {
  			if (la->la_flags & LLE_STATIC) {
  				LLE_WUNLOCK(la);
 -				log(LOG_ERR,
 -				    "arp: %*D attempts to modify permanent "
 -				    "entry for %s on %s\n",
 -				    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
 -				    inet_ntoa(isaddr), ifp->if_xname);
 +				if (log_arp_permanent_modify)
 +					log(LOG_ERR,
 +					    "arp: %*D attempts to modify "
 +					    "permanent entry for %s on %s\n",
 +					    ifp->if_addrlen,
 +					    (u_char *)ar_sha(ah), ":",
 +					    inet_ntoa(isaddr), ifp->if_xname);
  				goto reply;
  			}
  			if (log_arp_movements) {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"