From owner-svn-src-all@FreeBSD.ORG  Thu Dec  6 08:15:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 44A3EDF2;
 Thu,  6 Dec 2012 08:15:07 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 295338FC0C;
 Thu,  6 Dec 2012 08:15:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB68F7VQ096887;
 Thu, 6 Dec 2012 08:15:07 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB68F7HZ096886;
 Thu, 6 Dec 2012 08:15:07 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201212060815.qB68F7HZ096886@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 6 Dec 2012 08:15:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243939 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 08:15:07 -0000

Author: glebius
Date: Thu Dec  6 08:15:06 2012
New Revision: 243939
URL: http://svnweb.freebsd.org/changeset/base/243939

Log:
    Revert erroneous r242693. A state may have PFTM_UNLINKED being on the
  PFSYNC_S_DEL queue of pfsync.

Modified:
  head/sys/netpfil/pf/if_pfsync.c

Modified: head/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- head/sys/netpfil/pf/if_pfsync.c	Thu Dec  6 06:29:08 2012	(r243938)
+++ head/sys/netpfil/pf/if_pfsync.c	Thu Dec  6 08:15:06 2012	(r243939)
@@ -1534,16 +1534,6 @@ pfsync_sendout(int schedswi)
 			KASSERT(st->sync_state == q,
 				("%s: st->sync_state == q",
 					__func__));
-			if (st->timeout == PFTM_UNLINKED) {
-				/*
-				 * This happens if pfsync was once
-				 * stopped, and then re-enabled
-				 * after long time. Theoretically
-				 * may happen at usual runtime, too.
-				 */
-				pf_release_state(st);
-				continue;
-			}
 			/*
 			 * XXXGL: some of write methods do unlocked reads
 			 * of state data :(