Clean up ndiscvt a bit (leaving out the -i flag didn't work) and add

copyrights to the inf parser files.

Add a -n flag to ndiscvt to allow the user to override the default
device name of NDIS devices. Instead of "ndis0, ndis1, etc..."
you can have "foo0, foo1, etc..." This allows you to have more than
one kind of NDIS device in the kernel at the same time.

Convert from printf() to device_printf() in if_ndis.c, kern_ndis.c
and subr_ndis.c.

Create UMA zones for ndis_packet and ndis_buffer structs allocated
on transmit. The zones are created and destroyed in the modevent
handler in kern_ndis.c.

printf() and UMA changes submitted by green@freebsd.org

1 files changed, 9 insertions, 0 deletions

diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index caaa99c..7d6fb9cc1c 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -40,6 +40,7 @@
 .Nm
 .Op Fl i Ar <inffile>
 .Fl s Ar <sysfile>
+.Op Fl n Ar devname
 .Op Fl o Ar <outfile>
 .Sh DESCRIPTION
 The
@@ -93,6 +94,14 @@ a Windows(r) driver image. The
 utility will perform some manipulation of the sections within the
 executable file to make runtime linking within the kernel a little
 easier and then convert the image into a data array.
+.It Op Fl n Ar devname
+Specify an alternate name for the network device/interface which will
+be created when the driver is instantiated. If you need to load more
+than one NDIS driver into your system (i.e. if you have two different
+network cards in your system which require NDIS driver support), each
+module you create must have a unique name. Device can not be larger
+than IFNAMSIZ. If no name is specified, the driver will use the
+default a default name (``ndis'').
 .It Op Fl o Ar <outfile>
 Specify the output file in which to place the resulting data. This
 can be any file pathname. If