From owner-svn-src-head@FreeBSD.ORG  Mon Mar 19 21:09:13 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 468BD106566C;
	Mon, 19 Mar 2012 21:09:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 31EA88FC16;
	Mon, 19 Mar 2012 21:09:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JL9DTi086337;
	Mon, 19 Mar 2012 21:09:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JL9Dkl086335;
	Mon, 19 Mar 2012 21:09:13 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201203192109.q2JL9Dkl086335@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 19 Mar 2012 21:09:13 +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: r233202 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2012 21:09:13 -0000

Author: jhb
Date: Mon Mar 19 21:09:12 2012
New Revision: 233202
URL: http://svn.freebsd.org/changeset/base/233202

Log:
  Retire the IF_ADDR_LOCK() and IF_ADDR_UNLOCK() compat macros from HEAD.
  The new [RW]LOCK macros are merged back to 8.x so should be suitable for
  new code in HEAD even if it is to be MFC'd.

Modified:
  head/sys/net/if_var.h

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Mon Mar 19 20:49:42 2012	(r233201)
+++ head/sys/net/if_var.h	Mon Mar 19 21:09:12 2012	(r233202)
@@ -253,9 +253,6 @@ typedef void if_init_f_t(void *);
 #define	IF_ADDR_RUNLOCK(if)	rw_runlock(&(if)->if_addr_lock)
 #define	IF_ADDR_LOCK_ASSERT(if)	rw_assert(&(if)->if_addr_lock, RA_LOCKED)
 #define	IF_ADDR_WLOCK_ASSERT(if) rw_assert(&(if)->if_addr_lock, RA_WLOCKED)
-/* XXX: Compat. */
-#define	IF_ADDR_LOCK(if)	IF_ADDR_WLOCK(if)
-#define	IF_ADDR_UNLOCK(if)	IF_ADDR_WUNLOCK(if)
 
 /*
  * Function variations on locking macros intended to be used by loadable