From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 24 09:28:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 205F3106566C;
	Fri, 24 Aug 2012 09:28:23 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B4838FC12;
	Fri, 24 Aug 2012 09:28:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O9SM6u006429;
	Fri, 24 Aug 2012 09:28:22 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O9SMGZ006426;
	Fri, 24 Aug 2012 09:28:22 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208240928.q7O9SMGZ006426@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 24 Aug 2012 09:28:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239644 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 09:28:23 -0000

Author: glebius
Date: Fri Aug 24 09:28:22 2012
New Revision: 239644
URL: http://svn.freebsd.org/changeset/base/239644

Log:
  Bringing pfsync0 down should really disable pfsync_input().

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	Fri Aug 24 07:35:18 2012	(r239643)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 24 09:28:22 2012	(r239644)
@@ -594,8 +594,9 @@ pfsync_input(struct mbuf *m, __unused in
 
 	V_pfsyncstats.pfsyncs_ipackets++;
 
-	/* verify that we have a sync interface configured */
-	if (!sc || !sc->sc_sync_if || !V_pf_status.running)
+	/* Verify that we have a sync interface configured. */
+	if (!sc || !sc->sc_sync_if || !V_pf_status.running ||
+	    (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
 		goto done;
 
 	/* verify that the packet came in on the right interface */