From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:26:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB70D16A4D0; Tue, 9 Dec 2003 10:26:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C088516A4CE for ; Tue, 9 Dec 2003 10:26:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96D2443D2F for ; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IQnXJ013804 for ; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IQnww013801 for perforce@freebsd.org; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:26:49 -0800 (PST) Message-Id: <200312091826.hB9IQnww013801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2003 18:26:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43688 Change 43688 by sam@sam_ebb on 2003/12/09 10:26:46 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#3 (text+ko) ==== @@ -31,13 +31,12 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.105 2003/08/05 00:27:54 hsu Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.108 2003/11/16 06:11:26 alc Exp $ */ #ifndef _SYS_SOCKETVAR_H_ #define _SYS_SOCKETVAR_H_ -#include /* for struct label */ #include /* for TAILQ macros */ #include /* for struct selinfo */ @@ -116,8 +115,8 @@ void (*so_upcall)(struct socket *, void *, int); void *so_upcallarg; struct ucred *so_cred; /* user credentials */ - struct label so_label; /* MAC label for socket */ - struct label so_peerlabel; /* cached MAC label for socket peer */ + struct label *so_label; /* MAC label for socket */ + struct label *so_peerlabel; /* cached MAC label for socket peer */ /* NB: generation count must not be first; easiest to make it last. */ so_gen_t so_gencnt; /* generation count */ void *so_emuldata; /* private data for emulators */ @@ -335,12 +334,6 @@ struct thread *sopt_td; /* calling thread or null if kernel */ }; -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - struct vm_page *m; /* currently mapped page */ - vm_offset_t kva; /* va of mapping */ -}; - struct accept_filter { char accf_name[16]; void (*accf_callback) @@ -401,9 +394,6 @@ struct thread *td); void sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb); int sbwait(struct sockbuf *sb); -struct sf_buf * - sf_buf_alloc(struct vm_page *m); -void sf_buf_free(void *addr, void *args); int sb_lock(struct sockbuf *sb); int soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr **nam);