From owner-svn-src-all@FreeBSD.ORG  Mon Jun  1 20:59:40 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A7521065675;
	Mon,  1 Jun 2009 20:59:40 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 697558FC25;
	Mon,  1 Jun 2009 20:59:40 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51KxeAF091790;
	Mon, 1 Jun 2009 20:59:40 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51Kxe1l091789;
	Mon, 1 Jun 2009 20:59:40 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200906012059.n51Kxe1l091789@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Mon, 1 Jun 2009 20:59:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193266 - head/sys/netinet6
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: Mon, 01 Jun 2009 20:59:41 -0000

Author: zec
Date: Mon Jun  1 20:59:40 2009
New Revision: 193266
URL: http://svn.freebsd.org/changeset/base/193266

Log:
  Remove an #undef MIN that slipped under the radar and led me to
  hastily introduce an #define MIN() a few lines below in r191816.
  
  Approved by:	julian (mentor)
  Discussed with:	bz

Modified:
  head/sys/netinet6/nd6.c

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Mon Jun  1 20:54:41 2009	(r193265)
+++ head/sys/netinet6/nd6.c	Mon Jun  1 20:59:40 2009	(r193266)
@@ -281,7 +281,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd
 	if (ndi->maxmtu > V_in6_maxmtu)
 		in6_setmaxmtu(); /* check all interfaces just in case */
 
-#undef MIN
 }
 
 void
@@ -489,14 +488,6 @@ nd6_llinfo_timer(void *arg)
 	if ((ifp = ((ln->lle_tbl != NULL) ? ln->lle_tbl->llt_ifp : NULL)) == NULL)
 		panic("ln ifp == NULL");
 
-/*
- * XXX XXX XXX XXX XXX
- *
- * Why the ^%(@)*&%^) is this #define MIN() needed for CURVNET_SET()?!?
- * And #define MIN() is in sys/param.h already, which is #included first
- * here?!?
- */
-#define       MIN(a,b) (((a)<(b))?(a):(b))
 	CURVNET_SET(ifp->if_vnet);
 	INIT_VNET_INET6(curvnet);