svn commit: r233202 - head/sys/net

[John Baldwin]

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