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.200.4.1
retrieving revision 1.201
diff -u -p -r1.200.4.1 -r1.201
--- src/sys/kern/uipc_socket.c	2011/03/05 20:55:24	1.200.4.1
+++ src/sys/kern/uipc_socket.c	2010/10/14 03:07:51	1.201
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.200.4.1 2011/03/05 20:55:24 rmind Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.201 2010/10/14 03:07:51 oki Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.200.4.1 2011/03/05 20:55:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.201 2010/10/14 03:07:51 oki Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
@@ -98,9 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
 #include <compat/sys/socket.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_loan.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm.h>
 
 MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options");
 MALLOC_DEFINE(M_SONAME, "soname", "socket name");
@@ -463,10 +461,9 @@ socket_listener_cb(kauth_cred_t cred, ka
 
 	case KAUTH_REQ_NETWORK_SOCKET_OPEN:
 		/* We allow "raw" routing/bluetooth sockets to anyone. */
-		if ((u_long)arg1 == PF_ROUTE || (u_long)arg1 == PF_OROUTE
-		    || (u_long)arg1 == PF_BLUETOOTH) {
+		if ((u_long)arg1 == PF_ROUTE || (u_long)arg1 == PF_BLUETOOTH)
 			result = KAUTH_RESULT_ALLOW;
-		} else {
+		else {
 			/* Privileged, let secmodel handle this. */
 			if ((u_long)arg2 == SOCK_RAW)
 				break;