PERFORCE change 43688 for review
Sam Leffler
sam at FreeBSD.org
Tue Dec 9 10:26:52 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=43688
Change 43688 by sam at 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 <sys/_label.h> /* for struct label */
#include <sys/queue.h> /* for TAILQ macros */
#include <sys/selinfo.h> /* 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);
More information about the p4-projects
mailing list