svn commit: r286336 - in head/sys: amd64/include arm64/include i386/include mips/include powerpc/include sparc64/include

[Ed Maste]

Author: emaste
Date: Wed Aug  5 19:05:12 2015
New Revision: 286336
URL: https://svnweb.freebsd.org/changeset/base/286336

Log:
  Rationalize BSD license on sys/*/include/in_cksum.h
  
  Remove the advertising clause from the Regents of the University of
  California's license, per the letter dated July 22, 1999.
  
  Update clause numbering.

Modified:
  head/sys/amd64/include/in_cksum.h
  head/sys/arm64/include/in_cksum.h
  head/sys/i386/include/in_cksum.h
  head/sys/mips/include/in_cksum.h
  head/sys/powerpc/include/in_cksum.h
  head/sys/sparc64/include/in_cksum.h

Modified: head/sys/amd64/include/in_cksum.h
==============================================================================
--- head/sys/amd64/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/amd64/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/sys/arm64/include/in_cksum.h
==============================================================================
--- head/sys/arm64/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/arm64/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,11 +10,7 @@
  * 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 the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/sys/i386/include/in_cksum.h
==============================================================================
--- head/sys/i386/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/i386/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/sys/mips/include/in_cksum.h
==============================================================================
--- head/sys/mips/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/mips/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/sys/powerpc/include/in_cksum.h
==============================================================================
--- head/sys/powerpc/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/powerpc/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: head/sys/sparc64/include/in_cksum.h
==============================================================================
--- head/sys/sparc64/include/in_cksum.h	Wed Aug  5 18:55:40 2015	(r286335)
+++ head/sys/sparc64/include/in_cksum.h	Wed Aug  5 19:05:12 2015	(r286336)
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *