svn commit: r237312 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Wed Jun 20 14:22:38 2012
New Revision: 237312
URL: http://svn.freebsd.org/changeset/base/237312

Log:
  Don't use locking in the clone destroy routine.

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pfsync.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Wed Jun 20 14:19:55 2012	(r237311)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Wed Jun 20 14:22:38 2012	(r237312)
@@ -362,7 +362,6 @@ pfsync_clone_destroy(struct ifnet *ifp)
 	 * drain callouts.
 	 */
 relock:
-	PFSYNC_LOCK(sc);
 	while (sc->sc_deferred > 0) {
 		struct pfsync_deferral *pd = TAILQ_FIRST(&sc->sc_deferrals);
 	
@@ -374,7 +373,6 @@ relock:
 			free(pd, M_PFSYNC);
 		} else {
 			pd->pd_refs++;
-			PFSYNC_UNLOCK(sc);
 			callout_drain(&pd->pd_tmo);
 			free(pd, M_PFSYNC);
 			goto relock;