public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Matt Domsch <Matt_Domsch@dell.com>
To: Matt Mackall <mpm@selenic.com>,
	akpm@osdl.org, marcelo.tosatti@cyclades.com
Cc: Clay Haapala <chaapala@cisco.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2.6.1 -- take two] Add CRC32C chksums to crypto and lib routines
Date: Wed, 18 Feb 2004 17:18:27 -0600	[thread overview]
Message-ID: <20040218171827.A4407@lists.us.dell.com> (raw)
In-Reply-To: <20040218152403.A30333@lists.us.dell.com>; from Matt_Domsch@dell.com on Wed, Feb 18, 2004 at 03:24:03PM -0600

> After seeking advice from Dell's lawyers, they recommend simply adding
> the GPL license text to the top of the file and be done with it.
> It's public domain, we're free to include (and relicense) it as we
> wish.  If someone else wants to use it in a non-GPL fashion, they'll
> need to start from the original public domain submission, not this one
> which clearly has been modified somewhat since we first received it,
> with faster algorithms, creation of the table at compile time, etc.

Patch below applies to both 2.4.25 and 2.6.3, and replaces the public
domain statement and non-warranty with the GPL, as is permitted by the
code being in the public domain, and is done with legal advice.

Thanks,
Matt

-- 
Matt Domsch
Sr. Software Engineer, Lead Engineer
Dell Linux Solutions linux.dell.com & www.dell.com/linux
Linux on Dell mailing lists @ http://lists.us.dell.com


===== lib/crc32.c 1.11 vs edited =====
--- 1.11/lib/crc32.c	Tue Feb  3 23:29:15 2004
+++ edited/lib/crc32.c	Wed Feb 18 17:00:27 2004
@@ -1,6 +1,9 @@
-/* 
+/*
  * Oct 15, 2000 Matt Domsch <Matt_Domsch@dell.com>
  * Nicer crc32 functions/docs submitted by linux@horizon.com.  Thanks!
+ * Code was from the public domain, copyright abandoned.  Code was
+ * subsequently included in the kernel, thus was re-licensed under the
+ * GNU GPL v2.
  *
  * Oct 12, 2000 Matt Domsch <Matt_Domsch@dell.com>
  * Same crc32 function was used in 5 other places in the kernel.
@@ -12,7 +15,9 @@
  *   drivers/net/smc9194.c uses seed ~0, doesn't xor with ~0.
  *   fs/jffs2 uses seed 0, doesn't xor with ~0.
  *   fs/partitions/efi.c uses seed ~0, xor's with ~0.
- * 
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
  */
 
 #include <linux/crc32.h>
@@ -38,16 +43,10 @@
 #define attribute(x)
 #endif
 
-/*
- * This code is in the public domain; copyright abandoned.
- * Liability for non-performance of this code is limited to the amount
- * you paid for it.  Since it is distributed for free, your refund will
- * be very very small.  If it breaks, you get to keep both pieces.
- */
 
 MODULE_AUTHOR("Matt Domsch <Matt_Domsch@dell.com>");
 MODULE_DESCRIPTION("Ethernet CRC32 calculations");
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
 
 #if CRC_LE_BITS == 1
 /*

  reply	other threads:[~2004-02-18 23:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-01-14 21:31 [PATCH] Add CRC32C chksums to crypto routines Clay Haapala
2004-01-14 21:45 ` James Morris
2004-01-14 22:12   ` Clay Haapala
2004-01-16  1:40 ` Matt Mackall
2004-01-19 20:13 ` James Morris
2004-01-19 21:15   ` Clay Haapala
2004-01-19 21:33     ` James Morris
2004-02-03 16:58       ` [PATCH 2.6.1] Add CRC32C chksums to crypto and lib routines Clay Haapala
2004-02-03 17:09         ` James Morris
2004-02-04 17:07           ` Clay Haapala
2004-02-03 17:13         ` James Morris
2004-02-03 17:50           ` [PATCH 2.6.1 -- take two] " Clay Haapala
2004-02-03 18:51             ` Matt Mackall
2004-02-03 19:13               ` Clay Haapala
2004-02-03 19:27                 ` Matt Mackall
2004-02-03 20:17                   ` James Morris
2004-02-03 23:25                 ` Matt Domsch
2004-02-03 23:37                   ` Matt Mackall
2004-02-04 16:14                     ` Clay Haapala
2004-02-04 17:21                       ` Matt Mackall
2004-02-07 15:20                         ` Matt Domsch
2004-02-18 21:24                         ` Matt Domsch
2004-02-18 23:18                           ` Matt Domsch [this message]
2004-02-06 23:54                       ` Jamie Lokier
2004-02-04  2:18                   ` James Morris
2004-02-04  3:11                   ` Valdis.Kletnieks

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040218171827.A4407@lists.us.dell.com \
    --to=matt_domsch@dell.com \
    --cc=akpm@osdl.org \
    --cc=chaapala@cisco.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo.tosatti@cyclades.com \
    --cc=mpm@selenic.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox