Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
retrieving revision 1.151.2.1
retrieving revision 1.152
diff -u -p -r1.151.2.1 -r1.152
--- src/sys/kern/uipc_socket.c	2008/03/24 07:16:14	1.151.2.1
+++ src/sys/kern/uipc_socket.c	2008/02/27 19:55:59	1.152
@@ -1,7 +1,7 @@
-/*	$NetBSD: uipc_socket.c,v 1.151.2.1 2008/03/24 07:16:14 keiichi Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.152 2008/02/27 19:55:59 matt Exp $	*/
 
 /*-
- * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.151.2.1 2008/03/24 07:16:14 keiichi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.152 2008/02/27 19:55:59 matt Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -1682,9 +1682,8 @@ sogetopt(struct socket *so, int level, i
 void
 sohasoutofband(struct socket *so)
 {
-
 	fownsignal(so->so_pgid, SIGURG, POLL_PRI, POLLPRI|POLLRDBAND, so);
-	selnotify(&so->so_rcv.sb_sel, POLLPRI | POLLRDBAND, 0);
+	selwakeup(&so->so_rcv.sb_sel);
 }
 
 static void
@@ -1802,59 +1801,6 @@ soo_kqfilter(struct file *fp, struct kno
 	return (0);
 }
 
-static int
-sodopoll(struct socket *so, int events)
-{
-	int revents;
-
-	revents = 0;
-
-	if (events & (POLLIN | POLLRDNORM))
-		if (soreadable(so))
-			revents |= events & (POLLIN | POLLRDNORM);
-
-	if (events & (POLLOUT | POLLWRNORM))
-		if (sowritable(so))
-			revents |= events & (POLLOUT | POLLWRNORM);
-
-	if (events & (POLLPRI | POLLRDBAND))
-		if (so->so_oobmark || (so->so_state & SS_RCVATMARK))
-			revents |= events & (POLLPRI | POLLRDBAND);
-
-	return revents;
-}
-
-int
-sopoll(struct socket *so, int events)
-{
-	int revents = 0;
-	int s;
-
-	if ((revents = sodopoll(so, events)) != 0)
-		return revents;
-
-	KERNEL_LOCK(1, curlwp);
-	s = splsoftnet();
-
-	if ((revents = sodopoll(so, events)) == 0) {
-		if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
-			selrecord(curlwp, &so->so_rcv.sb_sel);
-			so->so_rcv.sb_flags |= SB_SEL;
-		}
-
-		if (events & (POLLOUT | POLLWRNORM)) {
-			selrecord(curlwp, &so->so_snd.sb_sel);
-			so->so_snd.sb_flags |= SB_SEL;
-		}
-	}
-
-	splx(s);
-	KERNEL_UNLOCK_ONE(curlwp);
-
-	return revents;
-}
-
-
 #include <sys/sysctl.h>
 
 static int sysctl_kern_somaxkva(SYSCTLFN_PROTO);