Module Name: src
Committed By: snj
Date: Wed Apr 8 23:10:13 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: sys_socket.c
Log Message:
Pull up following revision(s) (requested by ad in ticket #681):
sys/kern/sys_socket.c: revision 1.60
Patch out soo_drain until I fix it to work correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.58.10.1 -r1.58.10.2 src/sys/kern/sys_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.58.10.1 src/sys/kern/sys_socket.c:1.58.10.2
--- src/sys/kern/sys_socket.c:1.58.10.1 Sat Apr 4 23:36:27 2009
+++ src/sys/kern/sys_socket.c Wed Apr 8 23:10:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.58.10.1 2009/04/04 23:36:27 snj Exp $ */
+/* $NetBSD: sys_socket.c,v 1.58.10.2 2009/04/08 23:10:13 snj Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.58.10.1 2009/04/04 23:36:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.58.10.2 2009/04/08 23:10:13 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@
.fo_stat = soo_stat,
.fo_close = soo_close,
.fo_kqfilter = soo_kqfilter,
- .fo_drain = soo_drain,
+ .fo_drain = fnullop_drain, /* soo_drain, */
};
/* ARGSUSED */
