svn commit: r196121 - head/sys/netatalk

[Robert Watson]

Author: rwatson
Date: Wed Aug 12 10:44:13 2009
New Revision: 196121
URL: http://svn.freebsd.org/changeset/base/196121

Log:
  Reverse misordered unlock and lock in at_control for netatalk phase I
  addresses.
  
  Submitted by:	Russell Cattelan <cattelan at thebarn.com>
  Approved by:	re (kib)

Modified:
  head/sys/netatalk/at_control.c

Modified: head/sys/netatalk/at_control.c
==============================================================================
--- head/sys/netatalk/at_control.c	Wed Aug 12 10:41:37 2009	(r196120)
+++ head/sys/netatalk/at_control.c	Wed Aug 12 10:44:13 2009	(r196121)
@@ -276,7 +276,7 @@ at_control(struct socket *so, u_long cmd
 			 * If the request is specifying phase 1, then
 			 * only look at a phase one address
 			 */
-			AT_IFADDR_RUNLOCK();
+			AT_IFADDR_RLOCK();
 			for (oaa = aa; aa; aa = TAILQ_NEXT(aa, aa_link)) {
 				if (aa->aa_ifp == ifp &&
 				    (aa->aa_flags & AFA_PHASE2) == 0)
@@ -286,7 +286,7 @@ at_control(struct socket *so, u_long cmd
 				ifa_free(&oaa->aa_ifa);
 			if (aa != NULL && oaa != aa)
 				ifa_ref(&aa->aa_ifa);
-			AT_IFADDR_RLOCK();
+			AT_IFADDR_RUNLOCK();
 		} else {
 			struct at_ifaddr *oaa;