Date: Thu, 6 Dec 2012 08:15:07 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243939 - head/sys/netpfil/pf Message-ID: <201212060815.qB68F7HZ096886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 :(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212060815.qB68F7HZ096886>