PERFORCE change 81406 for review
Robert Watson
rwatson at FreeBSD.org
Wed Aug 3 16:43:23 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=81406
Change 81406 by rwatson at rwatson_zoo on 2005/08/03 16:42:19
Integrate netsmp.
Affected files ...
.. //depot/projects/netsmp/src/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_cam.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.h#2 integrate
Differences ...
==== //depot/projects/netsmp/src/sys/dev/an/if_an_isa.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.15 2005/01/06 01:42:28 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.16 2005/08/03 15:07:14 imp Exp $");
#include "opt_inet.h"
@@ -77,12 +77,11 @@
{ 0, NULL }
};
-static int an_probe_isa (device_t);
-static int an_attach_isa (device_t);
+static int an_probe_isa(device_t);
+static int an_attach_isa(device_t);
static int
-an_probe_isa(dev)
- device_t dev;
+an_probe_isa(device_t dev)
{
int error = 0;
@@ -103,8 +102,7 @@
}
static int
-an_attach_isa(dev)
- device_t dev;
+an_attach_isa(device_t dev)
{
struct an_softc *sc = device_get_softc(dev);
int flags = device_get_flags(dev);
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt.c#2 (text+ko) ====
@@ -43,9 +43,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.12 2005/07/10 15:05:38 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.13 2005/08/03 14:08:41 gibbs Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.6 2005/07/10 15:05:38 scottl Exp $ */
+/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.7 2005/08/03 14:08:41 gibbs Exp $ */
/*-
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
@@ -44,9 +44,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_cam.c#2 (text+ko) ====
@@ -43,9 +43,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -60,7 +60,7 @@
* OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.1 2005/07/10 15:05:38 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.2 2005/08/03 14:08:41 gibbs Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h>
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_cam.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.1 2005/07/10 15:05:38 scottl Exp $ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.2 2005/08/03 14:08:41 gibbs Exp $ */
/*-
* LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
*
@@ -43,9 +43,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_pci.c#2 (text+ko) ====
@@ -45,9 +45,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.20 2005/07/10 15:05:38 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.21 2005/08/03 14:08:41 gibbs Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h>
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.c#2 (text+ko) ====
@@ -15,9 +15,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.1 2005/07/10 15:05:38 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.2 2005/08/03 14:08:41 gibbs Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_raid.h>
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.1 2005/07/10 15:05:38 scottl Exp $ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.2 2005/08/03 14:08:41 gibbs Exp $ */
/*-
* Definitions for the integrated RAID features LSI MPT Fusion adapters.
*
@@ -16,9 +16,9 @@
* ("Disclaimer") and any redistribution must be conditioned upon including
* a substantially similar Disclaimer requirement for further binary
* redistribution.
- * 3. Neither the name of the LSI Logic Corporation nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+ * 3. Neither the names of the above listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
More information about the p4-projects
mailing list