From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 10:22:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5257E16A4D0; Tue,  9 Dec 2003 10:22:44 -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 2686116A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:22:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD2743D2F
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:22:42 -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 hB9IMgXJ013586
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 10:22:42 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IMg7R013583
	for perforce@freebsd.org; Tue, 9 Dec 2003 10:22:42 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 10:22:42 -0800 (PST)
Message-Id: <200312091822.hB9IMg7R013583@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43685 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2003 18:22:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=43685

Change 43685 by sam@sam_ebb on 2003/12/09 10:22:04

	IFC

Affected files ...

.. //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#3 integrate

Differences ...

==== //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.115 2003/10/21 18:28:35 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.118 2003/11/18 00:39:03 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
@@ -363,7 +363,7 @@
 {
 	SOCKBUF_LOCK_ASSERT(sb);
 
-	selwakeup(&sb->sb_sel);
+	selwakeuppri(&sb->sb_sel, PSOCK);
 	sb->sb_flags &= ~SB_SEL;
 	if (sb->sb_flags & SB_WAIT) {
 		sb->sb_flags &= ~SB_WAIT;
@@ -1285,6 +1285,16 @@
 }
 
 /*
+ * For protocol types that don't keep cached copies of labels in their
+ * pcbs, provide a null sosetlabel that does a NOOP.
+ */
+void
+pru_sosetlabel_null(struct socket *so)
+{
+
+}
+
+/*
  * Make a copy of a sockaddr in a malloced buffer of type M_SONAME.
  */
 struct sockaddr *