PERFORCE change 170094 for review
Alexander Motin
mav at FreeBSD.org
Mon Nov 2 19:21:04 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=170094
Change 170094 by mav at mav_mavbook on 2009/11/02 19:20:11
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.1#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/jail#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/accept.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/tty.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/ar.5#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/msdosfs.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/adding_user.7#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#117 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#25 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tail/tail.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/i2c/i2c.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/stablerestart.5#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.1#3 (text+ko) ====
@@ -25,12 +25,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $
.\"
.\" Developed by the TrustedBSD Project.
.\" Support for POSIX.1e access control lists.
.\"
-.Dd September 04, 2009
+.Dd September 4, 2009
.Dt GETFACL 1
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/etc/rc.d/jail#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $
#
# PROVIDE: jail
@@ -728,4 +728,4 @@
if [ -n "$*" ]; then
jail_list="$*"
fi
-run_rc_command "${cmd}"
+run_rc_command "${cmd}" &
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWN 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETFLAGS 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETPGROUP 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_GETSIGMASK 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_init.3#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" the referee document. The original Standard can be obtained online at
.\" http://www.opengroup.org/unix/online.html.
.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
.Dt POSIX_SPAWNATTR_INIT 3
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/lib/libc/sys/accept.2#3 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)accept.2 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.33 2008/06/20 14:47:06 phk Exp $
+.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.34 2009/11/02 07:21:13 cperciva Exp $
.\"
.Dd December 11, 1993
.Dt ACCEPT 2
@@ -126,6 +126,10 @@
For some applications, performance may be enhanced by using an
.Xr accept_filter 9
to pre-process incoming connections.
+.Pp
+Portable programs should not rely on the
+.Dv O_NONBLOCK
+property being inherited.
.Sh RETURN VALUES
The call returns \-1 on error.
If it succeeds, it returns a non-negative
==== //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#2 (text+ko) ====
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd November 25 2007
+.Dd November 25, 2007
.Os
.Dt PMC_ATTACH 3
.Sh NAME
==== //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#3 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mknod.8 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.32 2009/10/31 12:22:23 brueffer Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.33 2009/11/01 18:25:11 brueffer Exp $
.\"
.Dd October 31, 2009
.Dt MKNOD 8
@@ -74,7 +74,6 @@
.It Ar major
The major device number is an integer number which tells the kernel
which device driver entry point to use.
-This is a compatibility shim and should be left zero.
.It Ar minor
The minor device number tells the kernel which subunit
the node corresponds to on the device; for example,
==== //depot/projects/scottl-camlock/src/share/man/man4/tty.4#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tty.4 8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $
+.\" $FreeBSD: src/share/man/man4/tty.4,v 1.24 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Jun 27, 2007
+.Dd June 27, 2007
.Dt TTY 4
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/share/man/man5/ar.5#2 (text+ko) ====
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/share/man/man5/ar.5,v 1.1 2007/09/08 08:04:28 jkoshy Exp $
+.\" $FreeBSD: src/share/man/man5/ar.5,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd September 07, 2007
+.Dd September 7, 2007
.Os
.Dt AR 5
.Sh NAME
==== //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.141 2009/09/01 05:55:10 maxim Exp $
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.142 2009/11/02 12:03:04 remko Exp $
.\"
.Dd September 1, 2009
.Dt MAKE.CONF 5
@@ -318,6 +318,14 @@
.Xr cvsup 1
to update your ports with
.Dq Li "make update" .
+.It Va WWWSUPFILE
+.Pq Vt str
+The www
+.Ar supfile
+to use when doing a
+.Dq Li "make update"
+This defaults to
+.Pa /usr/share/examples/cvsup/www\-supfile .
.El
.Ss "BUILDING THE KERNEL"
The following list provides a name and short description for variables
==== //depot/projects/scottl-camlock/src/share/man/man5/msdosfs.5#3 (text+ko) ====
@@ -1,8 +1,8 @@
-.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.6 2007/08/22 18:04:08 gabor Exp $
+.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.7 2009/11/02 12:35:38 brueffer Exp $
.\" Written by Tom Rhodes
.\" This file is in the public domain.
.\"
-.Dd Aug 22, 2007
+.Dd August 22, 2007
.Dt MSDOSFS 5
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/share/man/man7/adding_user.7#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)adduser.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man7/adding_user.7,v 1.1 2009/01/30 15:14:58 gabor Exp $
+.\" $FreeBSD: src/share/man/man7/adding_user.7,v 1.2 2009/11/02 12:35:38 brueffer Exp $
.\"
-.Dd Jan 30, 2009
+.Dd January 30, 2009
.Dt ADDING_USER 8
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#117 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.231 2009/11/01 11:31:06 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.232 2009/11/02 08:31:00 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -4022,13 +4022,19 @@
&& path->device->lun_id != CAM_LUN_WILDCARD
&& device->lun_id != CAM_LUN_WILDCARD)
continue;
-
+ /*
+ * The async callback could free the device.
+ * If it is a broadcast async, it doesn't hold
+ * device reference, so take our own reference.
+ */
+ xpt_acquire_device(device);
(*(bus->xport->async))(async_code, bus,
target, device,
async_arg);
xpt_async_bcast(&device->asyncs, async_code,
path, async_arg);
+ xpt_release_device(device);
}
}
==== //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#15 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.105 2009/06/23 02:19:59 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.107 2009/11/02 18:51:24 rpaulo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@
break;
}
- return(error);
+ return (error);
}
DEV_MODULE(ndisapi, ndis_modevent, NULL);
MODULE_VERSION(ndisapi, 1);
@@ -193,7 +193,6 @@
ndis_sendrsrcavail_func(adapter)
ndis_handle adapter;
{
- return;
}
static void
@@ -211,8 +210,7 @@
sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
ifp = sc->ifp;
if (ifp->if_flags & IFF_DEBUG)
- device_printf (sc->ndis_dev, "status: %x\n", status);
- return;
+ device_printf(sc->ndis_dev, "status: %x\n", status);
}
static void
@@ -227,8 +225,7 @@
sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
ifp = sc->ifp;
if (ifp->if_flags & IFF_DEBUG)
- device_printf (sc->ndis_dev, "status complete\n");
- return;
+ device_printf(sc->ndis_dev, "status complete\n");
}
static void
@@ -241,7 +238,6 @@
block->nmb_setstat = status;
KeSetEvent(&block->nmb_setevent, IO_NO_INCREMENT, FALSE);
- return;
}
static void
@@ -254,7 +250,6 @@
block->nmb_getstat = status;
KeSetEvent(&block->nmb_getevent, IO_NO_INCREMENT, FALSE);
- return;
}
static void
@@ -270,10 +265,8 @@
ifp = sc->ifp;
if (ifp->if_flags & IFF_DEBUG)
- device_printf (sc->ndis_dev, "reset done...\n");
+ device_printf(sc->ndis_dev, "reset done...\n");
KeSetEvent(&block->nmb_resetevent, IO_NO_INCREMENT, FALSE);
-
- return;
}
int
@@ -287,7 +280,7 @@
struct sysctl_ctx_entry *e;
if (arg == NULL)
- return(EINVAL);
+ return (EINVAL);
sc = arg;
vals = sc->ndis_regvals;
@@ -367,7 +360,7 @@
"Interrupt Number", buf, CTLFLAG_RD);
}
- return(0);
+ return (0);
}
int
@@ -388,7 +381,7 @@
if (cfg == NULL) {
printf("failed for %s\n", key);
- return(ENOMEM);
+ return (ENOMEM);
}
cfg->ndis_cfg.nc_cfgkey = strdup(key, M_DEVBUF);
@@ -415,7 +408,7 @@
cfg->ndis_cfg.nc_cfgdesc);
#endif
- return(0);
+ return (0);
}
/*
@@ -451,7 +444,7 @@
free(cfg, M_DEVBUF);
}
- return(0);
+ return (0);
}
static void
@@ -488,8 +481,6 @@
KeAcquireSpinLock(&block->nmb_returnlock, &irql);
}
KeReleaseSpinLock(&block->nmb_returnlock, irql);
-
- return;
}
void
@@ -522,8 +513,6 @@
IoQueueWorkItem(block->nmb_returnitem,
(io_workitem_func)kernndis_functbl[7].ipt_wrap,
WORKQUEUE_CRITICAL, block);
-
- return;
}
void
@@ -540,8 +529,6 @@
IoFreeMdl(b0);
b0 = next;
}
-
- return;
}
void
@@ -553,7 +540,6 @@
ndis_free_bufs(p->np_private.npp_head);
NdisFreePacket(p);
- return;
}
int
@@ -567,26 +553,18 @@
device_t dev;
struct resource_list *brl;
struct resource_list_entry *brle;
-#if __FreeBSD_version < 600022
- struct resource_list brl_rev;
- struct resource_list_entry *n;
-#endif
int error = 0;
sc = arg;
block = sc->ndis_block;
dev = sc->ndis_dev;
-#if __FreeBSD_version < 600022
- SLIST_INIT(&brl_rev);
-#endif
-
rl = malloc(sizeof(ndis_resource_list) +
(sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)),
M_DEVBUF, M_NOWAIT|M_ZERO);
if (rl == NULL)
- return(ENOMEM);
+ return (ENOMEM);
rl->cprl_version = 5;
rl->cprl_version = 1;
@@ -597,37 +575,7 @@
if (brl != NULL) {
-#if __FreeBSD_version < 600022
- /*
- * We have a small problem. Some PCI devices have
- * multiple I/O ranges. Windows orders them starting
- * from lowest numbered BAR to highest. We discover
- * them in that order too, but insert them into a singly
- * linked list head first, which means when time comes
- * to traverse the list, we enumerate them in reverse
- * order. This screws up some drivers which expect the
- * BARs to be in ascending order so that they can choose
- * the "first" one as their register space. Unfortunately,
- * in order to fix this, we have to create our own
- * temporary list with the entries in reverse order.
- */
-
- SLIST_FOREACH(brle, brl, link) {
- n = malloc(sizeof(struct resource_list_entry),
- M_TEMP, M_NOWAIT);
- if (n == NULL) {
- error = ENOMEM;
- goto bad;
- }
- bcopy((char *)brle, (char *)n,
- sizeof(struct resource_list_entry));
- SLIST_INSERT_HEAD(&brl_rev, n, link);
- }
-
- SLIST_FOREACH(brle, &brl_rev, link) {
-#else
STAILQ_FOREACH(brle, brl, link) {
-#endif
switch (brle->type) {
case SYS_RES_IOPORT:
prd->cprd_type = CmResourceTypePort;
@@ -671,17 +619,7 @@
block->nmb_rlist = rl;
-#if __FreeBSD_version < 600022
-bad:
-
- while (!SLIST_EMPTY(&brl_rev)) {
- n = SLIST_FIRST(&brl_rev);
- SLIST_REMOVE_HEAD(&brl_rev, link);
- free (n, M_TEMP);
- }
-#endif
-
- return(error);
+ return (error);
}
/*
@@ -711,7 +649,7 @@
int diff;
if (p == NULL || m0 == NULL)
- return(EINVAL);
+ return (EINVAL);
priv = &p->np_private;
buf = priv->npp_head;
@@ -729,7 +667,7 @@
if (m == NULL) {
m_freem(*m0);
*m0 = NULL;
- return(ENOBUFS);
+ return (ENOBUFS);
}
m->m_len = MmGetMdlByteCount(buf);
m->m_data = MmGetMdlVirtualAddress(buf);
@@ -765,7 +703,7 @@
}
(*m0)->m_pkthdr.len = totlen;
- return(0);
+ return (0);
}
/*
@@ -793,7 +731,7 @@
ndis_packet_private *priv;
if (p == NULL || *p == NULL || m0 == NULL)
- return(EINVAL);
+ return (EINVAL);
priv = &(*p)->np_private;
priv->npp_totlen = m0->m_pkthdr.len;
@@ -805,7 +743,7 @@
if (buf == NULL) {
ndis_free_packet(*p);
*p = NULL;
- return(ENOMEM);
+ return (ENOMEM);
}
MmBuildMdlForNonPagedPool(buf);
@@ -818,7 +756,7 @@
priv->npp_tail = buf;
- return(0);
+ return (0);
}
int
@@ -831,25 +769,25 @@
ndis_oid *o;
if (arg == NULL || oids == NULL || oidcnt == NULL)
- return(EINVAL);
+ return (EINVAL);
len = 0;
ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, NULL, &len);
o = malloc(len, M_DEVBUF, M_NOWAIT);
if (o == NULL)
- return(ENOMEM);
+ return (ENOMEM);
rval = ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, o, &len);
if (rval) {
free(o, M_DEVBUF);
- return(rval);
+ return (rval);
}
*oids = o;
*oidcnt = len / 4;
- return(0);
+ return (0);
}
int
@@ -893,7 +831,7 @@
sc->ndis_block->nmb_devicectx == NULL) {
sc->ndis_block->nmb_pendingreq = NULL;
KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
- return(ENXIO);
+ return (ENXIO);
}
rval = MSCALL6(setfunc, adapter, oid, buf, *buflen,
@@ -917,19 +855,19 @@
*buflen = bytesneeded;
if (rval == NDIS_STATUS_INVALID_LENGTH)
- return(ENOSPC);
+ return (ENOSPC);
if (rval == NDIS_STATUS_INVALID_OID)
- return(EINVAL);
+ return (EINVAL);
if (rval == NDIS_STATUS_NOT_SUPPORTED ||
rval == NDIS_STATUS_NOT_ACCEPTED)
- return(ENOTSUP);
+ return (ENOTSUP);
if (rval != NDIS_STATUS_SUCCESS)
- return(ENODEV);
+ return (ENODEV);
- return(0);
+ return (0);
}
typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status);
@@ -951,7 +889,7 @@
sc = arg;
adapter = sc->ndis_block->nmb_miniportadapterctx;
if (adapter == NULL)
- return(ENXIO);
+ return (ENXIO);
sendfunc = sc->ndis_chars->nmc_sendmulti_func;
senddonefunc = sc->ndis_block->nmb_senddone_func;
@@ -976,7 +914,7 @@
if (NDIS_SERIALIZED(sc->ndis_block))
KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
- return(0);
+ return (0);
}
int
@@ -994,7 +932,7 @@
sc = arg;
adapter = sc->ndis_block->nmb_miniportadapterctx;
if (adapter == NULL)
- return(ENXIO);
+ return (ENXIO);
sendfunc = sc->ndis_chars->nmc_sendsingle_func;
senddonefunc = sc->ndis_block->nmb_senddone_func;
@@ -1006,7 +944,7 @@
if (status == NDIS_STATUS_PENDING) {
if (NDIS_SERIALIZED(sc->ndis_block))
KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
- return(0);
+ return (0);
}
MSCALL3(senddonefunc, sc->ndis_block, packet, status);
@@ -1014,7 +952,7 @@
if (NDIS_SERIALIZED(sc->ndis_block))
KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
- return(0);
+ return (0);
}
int
@@ -1030,18 +968,18 @@
M_DEVBUF, M_NOWAIT|M_ZERO);
if (sc->ndis_tmaps == NULL)
- return(ENOMEM);
+ return (ENOMEM);
for (i = 0; i < sc->ndis_maxpkts; i++) {
error = bus_dmamap_create(sc->ndis_ttag, 0,
&sc->ndis_tmaps[i]);
if (error) {
free(sc->ndis_tmaps, M_DEVBUF);
- return(ENODEV);
+ return (ENODEV);
}
}
- return(0);
+ return (0);
}
int
@@ -1070,7 +1008,7 @@
bus_dma_tag_destroy(sc->ndis_ttag);
- return(0);
+ return (0);
}
int
@@ -1093,7 +1031,7 @@
if (adapter == NULL || resetfunc == NULL ||
sc->ndis_block->nmb_devicectx == NULL) {
NDIS_UNLOCK(sc);
- return(EIO);
+ return (EIO);
}
NDIS_UNLOCK(sc);
@@ -1112,7 +1050,7 @@
KeWaitForSingleObject(&sc->ndis_block->nmb_resetevent,
0, 0, FALSE, NULL);
- return(0);
+ return (0);
}
int
@@ -1149,7 +1087,7 @@
adapter = sc->ndis_block->nmb_miniportadapterctx;
if (adapter == NULL) {
NDIS_UNLOCK(sc);
- return(EIO);
+ return (EIO);
}
sc->ndis_block->nmb_devicectx = NULL;
@@ -1169,7 +1107,7 @@
sc->ndis_block->nmb_miniportadapterctx = NULL;
NDIS_UNLOCK(sc);
- return(0);
+ return (0);
}
int
@@ -1186,7 +1124,7 @@
shutdownfunc = sc->ndis_chars->nmc_shutdown_handler;
NDIS_UNLOCK(sc);
if (adapter == NULL || shutdownfunc == NULL)
- return(EIO);
+ return (EIO);
if (sc->ndis_chars->nmc_rsvd0 == NULL)
MSCALL1(shutdownfunc, adapter);
@@ -1195,7 +1133,7 @@
TAILQ_REMOVE(&ndis_devhead, sc->ndis_block, link);
- return(0);
+ return (0);
}
int
@@ -1215,7 +1153,7 @@
pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler;
NDIS_UNLOCK(sc);
if (adapter == NULL || pnpeventfunc == NULL)
- return(EIO);
+ return (EIO);
if (sc->ndis_chars->nmc_rsvd0 == NULL)
MSCALL4(pnpeventfunc, adapter, type, NULL, 0);
@@ -1237,7 +1175,7 @@
uint32_t chosenmedium, i;
if (arg == NULL)
- return(EINVAL);
+ return (EINVAL);
sc = arg;
NDIS_LOCK(sc);
@@ -1262,7 +1200,7 @@
NDIS_LOCK(sc);
sc->ndis_block->nmb_miniportadapterctx = NULL;
NDIS_UNLOCK(sc);
- return(ENXIO);
+ return (ENXIO);
}
/*
@@ -1281,7 +1219,7 @@
sc->ndis_block->nmb_devicectx = sc;
NDIS_UNLOCK(sc);
- return(0);
+ return (0);
}
static void
@@ -1305,8 +1243,6 @@
if (KeInsertQueueDpc(&intr->ni_dpc, NULL, NULL) == TRUE)
intr->ni_dpccnt++;
KeReleaseSpinLockFromDpcLevel(&intr->ni_dpccountlock);
-
- return;
}
int
@@ -1343,7 +1279,7 @@
sc->ndis_block->nmb_devicectx == NULL) {
sc->ndis_block->nmb_pendingreq = NULL;
KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
- return(ENXIO);
+ return (ENXIO);
}
rval = MSCALL6(queryfunc, adapter, oid, buf, *buflen,
@@ -1370,19 +1306,19 @@
if (rval == NDIS_STATUS_INVALID_LENGTH ||
rval == NDIS_STATUS_BUFFER_TOO_SHORT)
- return(ENOSPC);
+ return (ENOSPC);
if (rval == NDIS_STATUS_INVALID_OID)
- return(EINVAL);
+ return (EINVAL);
if (rval == NDIS_STATUS_NOT_SUPPORTED ||
rval == NDIS_STATUS_NOT_ACCEPTED)
- return(ENOTSUP);
+ return (ENOTSUP);
if (rval != NDIS_STATUS_SUCCESS)
- return(ENODEV);
+ return (ENODEV);
- return(0);
+ return (0);
}
uint32_t
@@ -1403,14 +1339,14 @@
INTR_TYPE_NET | INTR_MPSAFE,
NULL, ntoskrnl_intr, NULL, &sc->ndis_intrhand);
if (error)
- return(NDIS_STATUS_FAILURE);
+ return (NDIS_STATUS_FAILURE);
}
status = IoCreateDevice(drv, sizeof(ndis_miniport_block), NULL,
FILE_DEVICE_UNKNOWN, 0, FALSE, &fdo);
if (status != STATUS_SUCCESS)
- return(status);
+ return (status);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list