From owner-svn-src-projects@FreeBSD.ORG  Wed Jun  6 10:57:00 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 1D855106564A;
	Wed,  6 Jun 2012 10:57:00 +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 08BC98FC0C;
	Wed,  6 Jun 2012 10:57:00 +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 q56AuxQe008659;
	Wed, 6 Jun 2012 10:56:59 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q56Auxa1008657;
	Wed, 6 Jun 2012 10:56:59 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206061056.q56Auxa1008657@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 6 Jun 2012 10:56:59 +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: r236673 - projects/pf/head/contrib/pf/pfctl
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: Wed, 06 Jun 2012 10:57:00 -0000

Author: glebius
Date: Wed Jun  6 10:56:59 2012
New Revision: 236673
URL: http://svn.freebsd.org/changeset/base/236673

Log:
  Remove undocumented auto-guessing based on physmem,
  better I later provide a paragraph in tuning(7).

Modified:
  projects/pf/head/contrib/pf/pfctl/pfctl.c

Modified: projects/pf/head/contrib/pf/pfctl/pfctl.c
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/pfctl.c	Wed Jun  6 09:44:57 2012	(r236672)
+++ projects/pf/head/contrib/pf/pfctl/pfctl.c	Wed Jun  6 10:56:59 2012	(r236673)
@@ -1552,9 +1552,6 @@ pfctl_fopen(const char *name, const char
 void
 pfctl_init_options(struct pfctl *pf)
 {
-	int64_t mem;
-	int mib[2];
-	size_t size;
 
 	pf->timeout[PFTM_TCP_FIRST_PACKET] = PFTM_TCP_FIRST_PACKET_VAL;
 	pf->timeout[PFTM_TCP_OPENING] = PFTM_TCP_OPENING_VAL;
@@ -1582,18 +1579,6 @@ pfctl_init_options(struct pfctl *pf)
 	pf->limit[PF_LIMIT_SRC_NODES] = PFSNODE_HIWAT;
 	pf->limit[PF_LIMIT_TABLE_ENTRIES] = PFR_KENTRY_HIWAT;
 
-	mib[0] = CTL_HW;
-#ifdef __FreeBSD__
-	mib[1] = HW_PHYSMEM;
-#else
-	mib[1] = HW_PHYSMEM64;
-#endif
-	size = sizeof(mem);
-	if (sysctl(mib, 2, &mem, &size, NULL, 0) == -1)
-		err(1, "sysctl");
-	if (mem <= 100*1024*1024)
-		pf->limit[PF_LIMIT_TABLE_ENTRIES] = PFR_KENTRY_HIWAT_SMALL; 
-
 	pf->debug = PF_DEBUG_URGENT;
 }