From owner-freebsd-current@FreeBSD.ORG  Mon Jun  4 17:50:14 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 053FE1065670;
	Mon,  4 Jun 2012 17:50:14 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id C4C4D8FC21;
	Mon,  4 Jun 2012 17:50:13 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id 221FAB9AB;
	Mon,  4 Jun 2012 13:50:13 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Matthias Apitz <guru@unixarea.de>
Date: Mon, 4 Jun 2012 12:16:46 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p13; KDE/4.5.5; amd64; ; )
References: <20120526142229.GA3893@tinyCurrent>
	<201205311134.55258.jhb@freebsd.org>
	<20120603085402.GA6129@tinyCurrent>
In-Reply-To: <20120603085402.GA6129@tinyCurrent>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Message-Id: <201206041216.46642.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Mon, 04 Jun 2012 13:50:13 -0400 (EDT)
Cc: swills@freebsd.org, freebsd-current@freebsd.org
Subject: Re: 10-CURRENT r235646 && open-vm-tools-8.6.0-425873
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 17:50:14 -0000

On Sunday, June 03, 2012 4:54:03 am Matthias Apitz wrote:
> El d=EDa Thursday, May 31, 2012 a las 11:34:55AM -0400, John Baldwin escr=
ibi=F3:
>=20
> > On Saturday, May 26, 2012 10:22:29 am Matthias Apitz wrote:
> > >=20
> > > Hi,
> > >=20
> > > The port ports/emulators/open-vm-tools does not compile in 10-CURRENT:
> > >=20
> > > # make install clean
> > > ...
> > > ...
> > > if_vxn.c:719: warning: implicit declaration of function 'IF_ADDR_LOCK'
> > > if_vxn.c:719: warning: nested extern declaration of 'IF_ADDR_LOCK'
> > > [-Wnested-ext erns]
> > > if_vxn.c:746: warning: implicit declaration of function 'IF_ADDR_UNLO=
CK'
> > > if_vxn.c:746: warning: nested extern declaration of 'IF_ADDR_UNLOCK'
> > > [-Wnested-e xterns]
> > > *** [if_vxn.o] Error code 1
> > >=20
> > > Let me know if you need more information.
> > > Thanks
> >=20
> > It should be using if_mcast_rlock() and if_mcast_runlock() instead of=20
using=20
> > those macros directly.  This works all the way back to 8.0.
>=20
> Hi,
>=20
> Is there a patch or some example how to replace
> IF_ADDR_LOCK/IF_ADDR_UNLOCK by if_mcast_rlock() and if_mcast_runlock()?
>=20
> The code in the above source looks like this:
>=20
> modules/freebsd/vmxnet/net_compat.h:
> ...
> #if __FreeBSD_version < 505000
> #   define VXN_IF_ADDR_LOCK(_ifp)
> #   define VXN_IF_ADDR_UNLOCK(_ifp)
> #else
> #   define VXN_IF_ADDR_LOCK(_ifp)       IF_ADDR_LOCK((_ifp))
> #   define VXN_IF_ADDR_UNLOCK(_ifp)     IF_ADDR_UNLOCK((_ifp))
> #endif

I think you can update this chunk to do:

#if __FreeBSD_version < 505000
=2E.. /* existing empty macros */
#elif __FreeBSD_version < 800000
#  define VXN_IF_ADDR_LOCK(_ifp)           IF_ADDR_LOCK((_ifp))
#  define VXN_IF_ADDR_UNLOCK(_ifp)         IF_ADDR_UNLOCK((_ifp))
#else
#  define VXN_IF_ADDR_LOCK(_ifp)           if_mcast_rlock((_ifp))
#  define VXN_IF_ADDR_UNLOCK(_ifp)         if_mcast_runlock((_ifp))
#endif

Does that help?

=2D-=20
John Baldwin