From owner-svn-src-head@FreeBSD.ORG Tue Oct 30 13:22:40 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5761063E; Tue, 30 Oct 2012 13:22:40 +0000 (UTC) (envelope-from zont@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 26D068FC14; Tue, 30 Oct 2012 13:22:40 +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 q9UDMeaV099058; Tue, 30 Oct 2012 13:22:40 GMT (envelope-from zont@svn.freebsd.org) Received: (from zont@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9UDMdOr099053; Tue, 30 Oct 2012 13:22:39 GMT (envelope-from zont@svn.freebsd.org) Message-Id: <201210301322.q9UDMdOr099053@svn.freebsd.org> From: Andrey Zonov Date: Tue, 30 Oct 2012 13:22:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242360 - in head/sys: conf dev/bce X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2012 13:22:40 -0000 Author: zont Date: Tue Oct 30 13:22:39 2012 New Revision: 242360 URL: http://svn.freebsd.org/changeset/base/242360 Log: - Remove BCE_JUMBO_HDRSPLIT kernel option which was forgotten in r218423. Approved by: davidch Approved by: kib (mentor) Modified: head/sys/conf/NOTES head/sys/conf/options head/sys/dev/bce/if_bcereg.h Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Tue Oct 30 13:05:50 2012 (r242359) +++ head/sys/conf/NOTES Tue Oct 30 13:22:39 2012 (r242360) @@ -2142,12 +2142,6 @@ device ral # Ralink Technology RT2500 # This option requires the TI_SF_BUF_JUMBO option above. #options TI_JUMBO_HDRSPLIT -# -# Use header splitting feature on bce(4) adapters. -# This may help to reduce the amount of jumbo-sized memory buffers used. -# -options BCE_JUMBO_HDRSPLIT - # These two options allow manipulating the mbuf cluster size and mbuf size, # respectively. Be very careful with NIC driver modules when changing # these from their default values, because that can potentially cause a Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Tue Oct 30 13:05:50 2012 (r242359) +++ head/sys/conf/options Tue Oct 30 13:22:39 2012 (r242360) @@ -523,7 +523,6 @@ SOCKET_SEND_COW opt_zero.h SOCKET_RECV_PFLIP opt_zero.h TI_SF_BUF_JUMBO opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h -BCE_JUMBO_HDRSPLIT opt_bce.h # XXX Conflict: # of devices vs network protocol (Native ATM). # This makes "atm.h" unusable. Modified: head/sys/dev/bce/if_bcereg.h ============================================================================== --- head/sys/dev/bce/if_bcereg.h Tue Oct 30 13:05:50 2012 (r242359) +++ head/sys/dev/bce/if_bcereg.h Tue Oct 30 13:22:39 2012 (r242360) @@ -289,7 +289,6 @@ * * #define BCE_DEBUG * #define BCE_NVRAM_WRITE_SUPPORT - * #define BCE_JUMBO_HDRSPLIT */ /****************************************************************************/