Module Name: src
Committed By: chuck
Date: Tue Feb 1 19:40:25 UTC 2011
Modified Files:
src/sys/netnatm: natm.c natm.h natm_pcb.c natm_proto.c
Log Message:
udpate license clauses on my code to match the new-style BSD licenses.
based on diff that rmind@ sent me.
no functional change with this commit.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/netnatm/natm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netnatm/natm.h
cvs rdiff -u -r1.13 -r1.14 src/sys/netnatm/natm_pcb.c \
src/sys/netnatm/natm_proto.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netnatm/natm.c
diff -u src/sys/netnatm/natm.c:1.22 src/sys/netnatm/natm.c:1.23
--- src/sys/netnatm/natm.c:1.22 Sat Apr 18 14:58:06 2009
+++ src/sys/netnatm/natm.c Tue Feb 1 19:40:24 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: natm.c,v 1.22 2009/04/18 14:58:06 tsutsui Exp $ */
+/* $NetBSD: natm.c,v 1.23 2011/02/01 19:40:24 chuck Exp $ */
/*
- *
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -13,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Charles D. Cranor and
- * Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.22 2009/04/18 14:58:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.23 2011/02/01 19:40:24 chuck Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netnatm/natm.h
diff -u src/sys/netnatm/natm.h:1.10 src/sys/netnatm/natm.h:1.11
--- src/sys/netnatm/natm.h:1.10 Sat Mar 14 14:46:11 2009
+++ src/sys/netnatm/natm.h Tue Feb 1 19:40:24 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: natm.h,v 1.10 2009/03/14 14:46:11 dsl Exp $ */
+/* $NetBSD: natm.h,v 1.11 2011/02/01 19:40:24 chuck Exp $ */
/*
- *
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -13,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Charles D. Cranor and
- * Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/netnatm/natm_pcb.c
diff -u src/sys/netnatm/natm_pcb.c:1.13 src/sys/netnatm/natm_pcb.c:1.14
--- src/sys/netnatm/natm_pcb.c:1.13 Wed Mar 18 16:00:24 2009
+++ src/sys/netnatm/natm_pcb.c Tue Feb 1 19:40:24 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: natm_pcb.c,v 1.13 2009/03/18 16:00:24 cegger Exp $ */
+/* $NetBSD: natm_pcb.c,v 1.14 2011/02/01 19:40:24 chuck Exp $ */
/*
- *
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -13,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Charles D. Cranor and
- * Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.13 2009/03/18 16:00:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.14 2011/02/01 19:40:24 chuck Exp $");
#include "opt_ddb.h"
Index: src/sys/netnatm/natm_proto.c
diff -u src/sys/netnatm/natm_proto.c:1.13 src/sys/netnatm/natm_proto.c:1.14
--- src/sys/netnatm/natm_proto.c:1.13 Thu Apr 24 11:38:39 2008
+++ src/sys/netnatm/natm_proto.c Tue Feb 1 19:40:24 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: natm_proto.c,v 1.13 2008/04/24 11:38:39 ad Exp $ */
+/* $NetBSD: natm_proto.c,v 1.14 2011/02/01 19:40:24 chuck Exp $ */
/*
- *
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
@@ -13,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Charles D. Cranor and
- * Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_proto.c,v 1.13 2008/04/24 11:38:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_proto.c,v 1.14 2011/02/01 19:40:24 chuck Exp $");
#include <sys/param.h>
#include <sys/systm.h>
