From owner-svn-src-user@FreeBSD.ORG Sun Mar 1 04:59:54 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2137106564A; Sun, 1 Mar 2009 04:59:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9FC1D8FC0A; Sun, 1 Mar 2009 04:59:54 +0000 (UTC) (envelope-from kmacy@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 n214xsq2031031; Sun, 1 Mar 2009 04:59:54 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n214xsnl031029; Sun, 1 Mar 2009 04:59:54 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903010459.n214xsnl031029@svn.freebsd.org> From: Kip Macy Date: Sun, 1 Mar 2009 04:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189205 - in user/kmacy/releng_7_fast_net/sys: kern netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2009 04:59:55 -0000 Author: kmacy Date: Sun Mar 1 04:59:54 2009 New Revision: 189205 URL: http://svn.freebsd.org/changeset/base/189205 Log: - fix accidental removal of inp_cred in 186573 - remove duplicate creation of subr_bufring.c in 189199 Modified: user/kmacy/releng_7_fast_net/sys/kern/subr_bufring.c user/kmacy/releng_7_fast_net/sys/netinet/in_pcb.h Modified: user/kmacy/releng_7_fast_net/sys/kern/subr_bufring.c ============================================================================== --- user/kmacy/releng_7_fast_net/sys/kern/subr_bufring.c Sun Mar 1 04:57:23 2009 (r189204) +++ user/kmacy/releng_7_fast_net/sys/kern/subr_bufring.c Sun Mar 1 04:59:54 2009 (r189205) @@ -66,71 +66,3 @@ buf_ring_free(struct buf_ring *br, struc { free(br, type); } -/************************************************************************** - * - * Copyright (c) 2007,2008 Kip Macy kmacy@freebsd.org - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. The name of Kip Macy nor the names of other - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * - ***************************************************************************/ -#include -__FBSDID("$FreeBSD$"); - - -#include -#include -#include -#include -#include -#include - - -struct buf_ring * -buf_ring_alloc(int count, struct malloc_type *type, int flags, struct mtx *lock) -{ - struct buf_ring *br; - - KASSERT(powerof2(count), ("buf ring must be size power of 2")); - - br = malloc(sizeof(struct buf_ring) + count*sizeof(caddr_t), - type, flags|M_ZERO); - if (br == NULL) - return (NULL); -#ifdef DEBUG_BUFRING - br->br_lock = lock; -#endif - br->br_prod_size = br->br_cons_size = count; - br->br_prod_mask = br->br_cons_mask = count-1; - br->br_prod_head = br->br_cons_head = 0; - br->br_prod_tail = br->br_cons_tail = 0; - - return (br); -} - -void -buf_ring_free(struct buf_ring *br, struct malloc_type *type) -{ - free(br, type); -} Modified: user/kmacy/releng_7_fast_net/sys/netinet/in_pcb.h ============================================================================== --- user/kmacy/releng_7_fast_net/sys/netinet/in_pcb.h Sun Mar 1 04:57:23 2009 (r189204) +++ user/kmacy/releng_7_fast_net/sys/netinet/in_pcb.h Sun Mar 1 04:59:54 2009 (r189205) @@ -161,6 +161,7 @@ struct inpcb { u_char inp_ip_p; /* (c) protocol proto */ u_char inp_ip_minttl; /* (i) minimum TTL or drop */ u_int inp_refcount; /* (i) refcount */ + struct ucred *inp_cred; /* (c) cache of socket cred */ void *inp_pspare[1]; /* L2 information */ struct rtentry *inp_rt; /* L3 information */