From owner-svn-src-all@FreeBSD.ORG  Sun Jan 25 16:52:41 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 921691065670;
	Sun, 25 Jan 2009 16:52:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 808E18FC12;
	Sun, 25 Jan 2009 16:52:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PGqfxm022640;
	Sun, 25 Jan 2009 16:52:41 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0PGqft9022639;
	Sun, 25 Jan 2009 16:52:41 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200901251652.n0PGqft9022639@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 25 Jan 2009 16:52:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187689 - head/sys/contrib/pf/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 25 Jan 2009 16:52:42 -0000

Author: ed
Date: Sun Jan 25 16:52:41 2009
New Revision: 187689
URL: http://svn.freebsd.org/changeset/base/187689

Log:
  Revert my previous two changes.
  
  Even though the code seems to be FreeBSD kernel code, it isn't compiled
  on FreeBSD. I could have known this, because I was a little amazed that
  I couldn't find a prototype of pfopen()/pfclose() somewhere else,
  because it isn't marked as static.
  
  Apart from that, removing these functions wouldn't have been harmful
  anyway, because there are some other strange things about them (the
  implementation isn't consistent with the prototype at the top). Still,
  it's better to leave it, because it makes merging code back to older
  branches a little harder.
  
  Requested by:	mlaier

Modified:
  head/sys/contrib/pf/net/pf_ioctl.c

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Sun Jan 25 14:39:15 2009	(r187688)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Sun Jan 25 16:52:41 2009	(r187689)
@@ -477,6 +477,22 @@ pf_thread_create(void *v)
 	if (kproc_create(pf_purge_thread, NULL, NULL, "pfpurge"))
 		panic("pfpurge thread");
 }
+
+int
+pfopen(struct cdev *dev, int flags, int fmt, struct proc *p)
+{
+	if (dev2unit(dev) >= 1)
+		return (ENXIO);
+	return (0);
+}
+
+int
+pfclose(struct cdev *dev, int flags, int fmt, struct proc *p)
+{
+	if (dev2unit(dev) >= 1)
+		return (ENXIO);
+	return (0);
+}
 #endif /* __FreeBSD__ */
 
 struct pf_pool *